Skip to content

Commit

Permalink
chg: revert to latest action and package versions
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
sarnold committed Dec 9, 2023
1 parent 972b165 commit fd2c061
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/conda-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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' || '' }}

Expand All @@ -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 \
Expand Down

0 comments on commit fd2c061

Please sign in to comment.