Skip to content

Commit

Permalink
Merge pull request #308 from ilastik/dependabot/github_actions/conda-…
Browse files Browse the repository at this point in the history
…incubator/setup-miniconda-3

* Bump conda-incubator/setup-miniconda from 2 to 3
* Use miniforge on CI
  • Loading branch information
k-dominik authored Dec 11, 2023
2 parents 3b20a89 + dcc2468 commit 94ff016
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: true
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/etc/build-env.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
channels:
- conda-forge
- ilastik-forge
dependencies:
- conda-build
- setuptools_scm
- boa
1 change: 0 additions & 1 deletion .github/workflows/etc/ilastik-env.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
name: ilastik-env
channels:
- conda-forge
- ilastik-forge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: true
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ jobs:
with:
# for codecov
fetch-depth: 5
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: ilastik-env
auto-activate-base: false
auto-update-conda: true
environment-file: .github/workflows/etc/ilastik-env.yaml
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
- name: linux test
if: matrix.os == 'ubuntu-latest'
Expand All @@ -41,8 +40,8 @@ jobs:
if: matrix.os == 'windows-latest'
shell: cmd /C CALL {0}
# auto activation of env does not seem to work on win
run: |
pip install -e . & pytest
run: >-
pip install -e . && pytest
- uses: codecov/codecov-action@v3
if: matrix.os == 'ubuntu-latest'
with:
Expand All @@ -62,15 +61,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: ""
auto-activate-base: true
activate-environment: build-env
environment-file: .github/workflows/etc/build-env.yaml
auto-update-conda: true
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
- name: install build deps
run: mamba install -n base -c conda-forge boa setuptools_scm -y
- name: linux conda build test
if: matrix.os == 'ubuntu-latest'
shell: bash -l {0}
Expand Down

0 comments on commit 94ff016

Please sign in to comment.