Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/composite/conda-env-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ runs:
key: ${{ runner.os }}-conda-env-${{ inputs.env_name }}-p${{ inputs.cache_period }}-b${{ inputs.cache_build }}

- if: steps.conda-env-cache.outputs.cache-hit != 'true'
shell: bash
shell: bash -el {0}
run: |
conda install --quiet --name ${{ inputs.env_name }} ${{ inputs.install_packages }}
2 changes: 1 addition & 1 deletion .github/workflows/docs-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
miniforge-version: latest
channels: conda-forge
activate-environment: ${{ env.ENV_NAME }}
environment-file: osop-spec-file-linux.yml
environment-file: envs/osop-linux-spec-file.yml
auto-update-conda: false
conda-remove-defaults: true

Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/pytest-cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,16 @@ concurrency:

jobs:
test:
name: Run pytest and coverage
runs-on: ubuntu-latest
name: Run pytest and coverage (${{ matrix.os }})
runs-on: ${{ matrix.os }}

strategy:
matrix:
include:
- os: ubuntu-latest
conda_file: envs/osop-spec-file-linux.yml
- os: windows-latest
conda_file: envs/osop-cpu-win.yml

defaults:
run:
Expand All @@ -45,7 +53,7 @@ jobs:
CACHE_WEEKS: 2
run: |
echo "CACHE_PERIOD=$(date +%Y).$(expr $(date +%U) / ${CACHE_WEEKS})" >> ${GITHUB_ENV}
echo "CONDA_FILE=./osop-spec-file-linux.txt" >> ${GITHUB_ENV}
echo "CONDA_FILE=${{ matrix.conda_file }}" >> ${GITHUB_ENV}

- name: "conda package cache"
uses: ./.github/workflows/composite/conda-pkg-cache
Expand All @@ -60,7 +68,7 @@ jobs:
miniforge-version: latest
channels: conda-forge
activate-environment: ${{ env.ENV_NAME }}
environment-file: osop-spec-file-linux.yml
environment-file: envs/osop-linux-spec-file.yml
auto-update-conda: false
conda-remove-defaults: true

Expand All @@ -81,6 +89,7 @@ jobs:
run: pytest -vv -s --maxfail=1 -m "not integration" --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov | tee pytest-coverage.txt

- name: Pytest coverage comment
if: runner.os == 'Linux'
uses: MishaKav/pytest-coverage-comment@main
with:
pytest-coverage-path: ./pytest-coverage.txt
Expand Down
Loading
Loading