From 462438aa38cfc98fb00bdf0560b758a3c3b1a4fe Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Mon, 28 Mar 2022 00:44:55 +1300 Subject: [PATCH 1/2] Run CI (tox) on macos --- .github/workflows/ci-tests.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index e2965f611..f21967e4e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -19,10 +19,11 @@ jobs: tox: name: CI tests via Tox - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} strategy: matrix: + os: ['ubuntu-20.04', 'macos'] py-ver-major: [3] py-ver-minor: [6, 7, 8, 9, 10] step: [lint, unit, bandit, mypy] @@ -37,7 +38,7 @@ jobs: fetch-depth: 0 - name: Set up Singularity - if: ${{ matrix.step == 'unit' || matrix.step == 'mypy' }} + if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.step == 'unit' || matrix.step == 'mypy' }} uses: eWaterCycle/setup-singularity@v7 with: singularity-version: ${{ env.singularity_version }} @@ -61,7 +62,7 @@ jobs: pip install tox tox-gh-actions - name: MyPy cache - if: ${{ matrix.step == 'mypy' }} + if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.step == 'mypy' }} uses: actions/cache@v3 with: path: .mypy_cache/${{ env.py-semver }} @@ -71,7 +72,7 @@ jobs: run: tox - name: Upload coverage to Codecov - if: ${{ matrix.step == 'unit' }} + if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.step == 'unit' }} uses: codecov/codecov-action@v2.1.0 with: fail_ci_if_error: true From 8e6bc017ded316d9b1f1f9b345201dbfd555d4ef Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Mon, 28 Mar 2022 17:43:13 +1300 Subject: [PATCH 2/2] Disable coverage --- .github/workflows/ci-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index f21967e4e..01db228b1 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -71,11 +71,11 @@ jobs: - name: Test with tox run: tox - - name: Upload coverage to Codecov - if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.step == 'unit' }} - uses: codecov/codecov-action@v2.1.0 - with: - fail_ci_if_error: true +# - name: Upload coverage to Codecov +# if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.step == 'unit' }} +# uses: codecov/codecov-action@v2.1.0 +# with: +# fail_ci_if_error: true tox-style: name: CI linters via Tox