From 3541a40db5f2b7548837d97929efaa5ab3887286 Mon Sep 17 00:00:00 2001 From: Henrik Kjedsberg Date: Thu, 26 Sep 2024 14:36:32 +0200 Subject: [PATCH 1/4] Test with micromamba --- .github/workflows/lint_and_test.yaml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index 26c9e93..e7f8aec 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -57,14 +57,21 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v3 + - uses: mamba-org/setup-micromamba@v1 with: - mamba-version: '*' - channels: conda-forge,vmtk - channel-priority: flexible - activate-environment: morphman-env environment-file: environment.yml - python-version: '3.10' + init-shell: bash + cache-environment: true + +# +# - uses: conda-incubator/setup-miniconda@v3 +# with: +# mamba-version: '*' +# channels: conda-forge,vmtk +# channel-priority: flexible +# activate-environment: morphman-env +# environment-file: environment.yml +# python-version: '3.10' - uses: actions/cache@v3 with: From 39b2700ed10ef29ecf0d57ab49eca96079dab731 Mon Sep 17 00:00:00 2001 From: Henrik Kjedsberg Date: Thu, 26 Sep 2024 14:41:28 +0200 Subject: [PATCH 2/4] Update cache --- .github/workflows/lint_and_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index e7f8aec..86982b2 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -11,7 +11,7 @@ on: - cron: '0 8 * * *' env: - CACHE_NUMBER: 1 # Increase to reset cache + CACHE_NUMBER: 2 # Increase to reset cache jobs: check-code: From d1963b52bbbec7557360e0bb03996e01f865912c Mon Sep 17 00:00:00 2001 From: Henrik Kjedsberg Date: Thu, 26 Sep 2024 14:43:00 +0200 Subject: [PATCH 3/4] Test without libitk --- .github/workflows/lint_and_test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index 86982b2..2556859 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -85,7 +85,6 @@ jobs: - name: Run tests run: | - mamba install libitk==5.3 python -m pytest tests - name: Upload coverage report to Codecov From b6265d740a5986404f6ace6b71ae5e292b0e6794 Mon Sep 17 00:00:00 2001 From: Henrik Kjedsberg Date: Thu, 26 Sep 2024 14:45:17 +0200 Subject: [PATCH 4/4] Remove unused CI code --- .github/workflows/lint_and_test.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index 2556859..f59c91a 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -63,16 +63,6 @@ jobs: init-shell: bash cache-environment: true -# -# - uses: conda-incubator/setup-miniconda@v3 -# with: -# mamba-version: '*' -# channels: conda-forge,vmtk -# channel-priority: flexible -# activate-environment: morphman-env -# environment-file: environment.yml -# python-version: '3.10' - - uses: actions/cache@v3 with: path: ${{ matrix.prefix }}