From aba689db1ef0e40ddb9e993d42749b4de30fb343 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Tue, 1 Oct 2024 09:49:02 -0700 Subject: [PATCH 1/2] Update mambaforge references in GHA --- .github/workflows/build_and_deploy_mac.yml | 6 ++---- .github/workflows/testing_dev.yml | 6 ++---- .github/workflows/testing_dev_e2e_with_live_services.yml | 6 ++---- .github/workflows/testing_dev_with_live_services.yml | 6 ++---- .github/workflows/testing_flask_build_and_dist.yml | 8 +++----- .github/workflows/testing_pipelines.yml | 6 ++---- 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_and_deploy_mac.yml b/.github/workflows/build_and_deploy_mac.yml index d53b6ec34..a7cba9619 100644 --- a/.github/workflows/build_and_deploy_mac.yml +++ b/.github/workflows/build_and_deploy_mac.yml @@ -24,16 +24,14 @@ jobs: with: python-version: "3.10" - - name: Setup Mambaforge + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest activate-environment: nwb-guide - use-mamba: true - name: Create and activate environment - run: mamba env update --name nwb-guide --file environments/environment-MAC-intel.yml + run: conda env update --name nwb-guide --file environments/environment-MAC-intel.yml - name: Use Node.js 20 uses: actions/setup-node@v4 diff --git a/.github/workflows/testing_dev.yml b/.github/workflows/testing_dev.yml index 561f2b38b..5a41c90d4 100644 --- a/.github/workflows/testing_dev.yml +++ b/.github/workflows/testing_dev.yml @@ -37,13 +37,11 @@ jobs: - run: git fetch --prune --unshallow --tags # see https://github.com/conda-incubator/setup-miniconda#caching-environments - - name: Setup Mambaforge + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest activate-environment: nwb-guide - use-mamba: true - name: Set cache date id: get-date @@ -59,7 +57,7 @@ jobs: - if: steps.cache.outputs.cache-hit != 'true' name: Create and activate environment - run: mamba env update --name nwb-guide --file ${{ matrix.label }} + run: conda env update --name nwb-guide --file ${{ matrix.label }} - name: Use Node.js 20 uses: actions/setup-node@v4 diff --git a/.github/workflows/testing_dev_e2e_with_live_services.yml b/.github/workflows/testing_dev_e2e_with_live_services.yml index bd10f5f35..cd3633359 100644 --- a/.github/workflows/testing_dev_e2e_with_live_services.yml +++ b/.github/workflows/testing_dev_e2e_with_live_services.yml @@ -39,13 +39,11 @@ jobs: - run: git fetch --prune --unshallow --tags # see https://github.com/conda-incubator/setup-miniconda#caching-environments - - name: Setup Mambaforge + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest activate-environment: nwb-guide - use-mamba: true - name: Set cache date id: get-date @@ -61,7 +59,7 @@ jobs: - if: steps.cache.outputs.cache-hit != 'true' name: Create and activate environment - run: mamba env update -n nwb-guide -f ${{ matrix.label }} + run: conda env update -n nwb-guide -f ${{ matrix.label }} - name: Use Node.js 20 uses: actions/setup-node@v4 diff --git a/.github/workflows/testing_dev_with_live_services.yml b/.github/workflows/testing_dev_with_live_services.yml index 020db1391..48b130b4b 100644 --- a/.github/workflows/testing_dev_with_live_services.yml +++ b/.github/workflows/testing_dev_with_live_services.yml @@ -37,13 +37,11 @@ jobs: - run: git fetch --prune --unshallow --tags # see https://github.com/conda-incubator/setup-miniconda#caching-environments - - name: Setup Mambaforge + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest activate-environment: nwb-guide - use-mamba: true - name: Set cache date id: get-date @@ -59,7 +57,7 @@ jobs: - if: steps.cache.outputs.cache-hit != 'true' name: Create and activate environment - run: mamba env update -n nwb-guide -f ${{ matrix.label }} + run: conda env update -n nwb-guide -f ${{ matrix.label }} - name: Use Node.js 20 uses: actions/setup-node@v4 diff --git a/.github/workflows/testing_flask_build_and_dist.yml b/.github/workflows/testing_flask_build_and_dist.yml index a892ff2a9..76aea45d8 100644 --- a/.github/workflows/testing_flask_build_and_dist.yml +++ b/.github/workflows/testing_flask_build_and_dist.yml @@ -36,20 +36,18 @@ jobs: run: uname -m # see https://github.com/conda-incubator/setup-miniconda#caching-environments - - name: Setup Mambaforge + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest activate-environment: nwb-guide - use-mamba: true - name: Set cache date id: get-date run: echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - - name: Cache Mamba env + - name: Cache Conda env uses: actions/cache@v4 with: path: ${{ env.CONDA }}/envs @@ -61,7 +59,7 @@ jobs: - if: steps.cache.outputs.cache-hit != 'true' name: Update environment - run: mamba env update -f ${{ matrix.label }} + run: conda env update -f ${{ matrix.label }} - name: Setup Node.js 20 uses: actions/setup-node@v4 diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml index 57fe37fee..8892eacd0 100644 --- a/.github/workflows/testing_pipelines.yml +++ b/.github/workflows/testing_pipelines.yml @@ -35,13 +35,11 @@ jobs: - run: git fetch --prune --unshallow --tags # see https://github.com/conda-incubator/setup-miniconda#caching-environments - - name: Setup Mambaforge + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest activate-environment: nwb-guide - use-mamba: true # Setup conda environment from cache - name: Set environment cache date @@ -56,7 +54,7 @@ jobs: id: cache - if: steps.cache.outputs.cache-hit != 'true' name: Create and activate environment - run: mamba env update --name nwb-guide --file ${{ matrix.label }} + run: conda env update --name nwb-guide --file ${{ matrix.label }} - name: Use Node.js 20 uses: actions/setup-node@v4 From c77953c870f5a02882cb310aa88603d3b532eb59 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:21:18 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/testing_dev_e2e_with_live_services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing_dev_e2e_with_live_services.yml b/.github/workflows/testing_dev_e2e_with_live_services.yml index cd3633359..8367a8df7 100644 --- a/.github/workflows/testing_dev_e2e_with_live_services.yml +++ b/.github/workflows/testing_dev_e2e_with_live_services.yml @@ -39,7 +39,7 @@ jobs: - run: git fetch --prune --unshallow --tags # see https://github.com/conda-incubator/setup-miniconda#caching-environments - - name: Set up conda + - name: Set up conda uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest