From fd2c06114d31a20cf62c9eeaf337943b58f8b68e Mon Sep 17 00:00:00 2001
From: Stephen L Arnold <sarnold@vctlabs.com>
Date: Fri, 8 Dec 2023 18:08:12 -0800
Subject: [PATCH] chg: revert to latest action and package versions

* leave default PY_VER but do not specify version for action
* use proper activate command workflow in build step
* try explicit activate path on windows, else conda activate

Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>
---
 .github/workflows/conda-dev.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/conda-dev.yml b/.github/workflows/conda-dev.yml
index 6f492258c1..98cf1b33b7 100644
--- a/.github/workflows/conda-dev.yml
+++ b/.github/workflows/conda-dev.yml
@@ -12,9 +12,6 @@ jobs:
   build:
     name: abc ${{ matrix.python-version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash -el {0}
     strategy:
       fail-fast: false
       matrix:
@@ -37,7 +34,7 @@ jobs:
             extra_args: '-DABC_USE_NO_PTHREADS=ON -DABC_USE_NO_READLINE=ON'
     env:
       OS: ${{ matrix.os }}
-      PYTHON: ${{ matrix.python-version }}
+      PY_VER: ${{ matrix.python-version }}
       PYTHONIOENCODING: utf-8
       CMAKE_ARGS: ${{ matrix.use_namespace && '-DABC_USE_NAMESPACE=xxx' || '' }}
 
@@ -54,35 +51,41 @@ jobs:
       uses: actions/cache@v3
       env:
         # Increase this value to reset cache if environment.devenv.yml has not changed
-        CACHE_NUMBER: 1
+        CACHE_NUMBER: 2
       with:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.devenv.yml') }}
 
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         auto-activate-base: true
-        python-version: ${{ matrix.python-version }}
+        activate-environment: ''
         channels: conda-forge
         channel-priority: flexible
 
     - name: Configure condadev environment
+      shell: bash -l {0}
       env:
         PY_VER: ${{ matrix.python-version }}
       run: |
         conda config --set always_yes yes --set changeps1 no
-        conda install conda-devenv=2.1.1
+        conda install conda-devenv=3.2.0
         conda info
         conda list
 
     - name: Build and test
+      shell: bash -l {0}
       env:
         PY_VER: ${{ matrix.python-version }}
       run: |
         conda devenv
+        if [ "${{ runner.os }}" = Windows ]; then
+          C:\\Miniconda\\Scripts\\activate abc
+        else
+          conda activate abc
+        fi
         conda info --envs
-        source activate abc
         conda list dirent
         ctest --build-generator "${{ matrix.generator }}" \
           --build-and-test . build \