From 327b7865c2b6a0edad3e3d10d49ed1f82410f7ef Mon Sep 17 00:00:00 2001 From: Nils Braun Date: Wed, 18 Aug 2021 08:41:05 +0200 Subject: [PATCH 1/2] Try to use the mambaforge installer to speed up the build process --- .github/workflows/deploy.yml | 4 ++++ .github/workflows/test.yml | 18 ++++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e8655522..836dd5521 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,6 +22,10 @@ jobs: key: ${{ runner.os }}-conda-v1-${{ hashFiles('conda.txt') }} - name: Set up Python uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge + use-mamba: true + python-version: 3.8 - name: Install dependencies shell: bash -l {0} run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87b246df0..3ff5b0354 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,11 +30,9 @@ jobs: - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: + miniforge-variant: Mambaforge + use-mamba: true python-version: 3.8 - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true - use-only-tar-bz2: true - name: Install dependencies and build the jar shell: bash -l {0} run: | @@ -77,11 +75,9 @@ jobs: - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: + miniforge-variant: Mambaforge + use-mamba: true python-version: ${{ matrix.python }} - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true - use-only-tar-bz2: true - name: Download the pre-build jar uses: actions/download-artifact@v1 with: @@ -142,11 +138,9 @@ jobs: - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: + miniforge-variant: Mambaforge + use-mamba: true python-version: 3.8 - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true - use-only-tar-bz2: true - name: Download the pre-build jar uses: actions/download-artifact@v1 with: From 20caccf5053e133866374e81d76729b449b6c164 Mon Sep 17 00:00:00 2001 From: Nils Braun Date: Wed, 18 Aug 2021 08:48:20 +0200 Subject: [PATCH 2/2] Increase the cache version number to force a conda cache clear --- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 836dd5521..f7734f854 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: uses: actions/cache@v2 with: path: ~/conda_pkgs_dir - key: ${{ runner.os }}-conda-v1-${{ hashFiles('conda.txt') }} + key: ${{ runner.os }}-conda-v3-${{ hashFiles('conda.txt') }} - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ff5b0354..46b6c41ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: uses: actions/cache@v2 with: path: ~/conda_pkgs_dir - key: ${{ runner.os }}-conda-v2-${{ hashFiles('conda.txt') }} + key: ${{ runner.os }}-conda-v3-${{ hashFiles('conda.txt') }} - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: @@ -71,7 +71,7 @@ jobs: uses: actions/cache@v2 with: path: ~/conda_pkgs_dir - key: ${{ runner.os }}-conda-v2-${{ matrix.java }}-${{ matrix.python }}-${{ hashFiles('conda.txt') }} + key: ${{ runner.os }}-conda-v3-${{ matrix.java }}-${{ matrix.python }}-${{ hashFiles('conda.txt') }} - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: @@ -134,7 +134,7 @@ jobs: uses: actions/cache@v2 with: path: ~/conda_pkgs_dir - key: ${{ runner.os }}-conda-v2-11-${{ hashFiles('conda.txt') }} + key: ${{ runner.os }}-conda-v3-11-${{ hashFiles('conda.txt') }} - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: