From 6e6779bbf056eb7702d17faffb50a07c28775c0e Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 8 Jan 2025 17:25:20 +0100 Subject: [PATCH 1/5] Drop miniforge-variant --- .github/workflows/job.test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 525af2246..3cd2f257b 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -62,7 +62,6 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: environment-file: requirements/github-actions.yml - miniforge-variant: Mambaforge use-mamba: true - name: Install linting dependencies @@ -141,7 +140,6 @@ jobs: - name: Set up Python and mamba uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge use-mamba: true - name: Install minimal build deps @@ -245,7 +243,6 @@ jobs: with: python-version: ${{ matrix.python }} environment-file: requirements/github-actions.yml - miniforge-variant: Mambaforge use-mamba: true - name: List all packages From 377ac34c8e1900428bde17ac0db0410b9a150c55 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 8 Jan 2025 17:33:36 +0100 Subject: [PATCH 2/5] try mamba-version --- .github/workflows/job.test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 3cd2f257b..f49edda19 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -62,7 +62,7 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: environment-file: requirements/github-actions.yml - use-mamba: true + mamba-version: "*" - name: Install linting dependencies run: mamba env update -n test --file requirements/lint.yml @@ -140,7 +140,7 @@ jobs: - name: Set up Python and mamba uses: conda-incubator/setup-miniconda@v3 with: - use-mamba: true + mamba-version: "*" - name: Install minimal build deps run: mamba install -n test -c conda-forge setuptools wheel 'jupyterlab${{ matrix.lab }}' 'nodejs${{ matrix.nodejs }}' @@ -243,7 +243,7 @@ jobs: with: python-version: ${{ matrix.python }} environment-file: requirements/github-actions.yml - use-mamba: true + mamba-version: "*" - name: List all packages run: conda list From ac61bf0cfe8507efa9091969157a66a58d8e47fc Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 8 Jan 2025 17:39:33 +0100 Subject: [PATCH 3/5] try --- .github/workflows/job.test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index f49edda19..5805b8f2e 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -141,6 +141,8 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: mamba-version: "*" + channels: conda-forge,nodefaults + channel-priority: true - name: Install minimal build deps run: mamba install -n test -c conda-forge setuptools wheel 'jupyterlab${{ matrix.lab }}' 'nodejs${{ matrix.nodejs }}' From 99910b915d93fd003cb1b7740585deedbf5fd95b Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 8 Jan 2025 17:44:15 +0100 Subject: [PATCH 4/5] cleanup --- .github/workflows/job.test.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index 5805b8f2e..b245a8c96 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -112,10 +112,6 @@ jobs: - name: Check distributions run: python scripts/distcheck.py - - name: Rename uncached conda packages - shell: bash - run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache" - build: name: build runs-on: ${{ matrix.os }}-latest @@ -201,10 +197,6 @@ jobs: name: jupyterlab-lsp dist ${{ github.run_number }} path: ./dist - - name: Rename uncached conda packages - shell: bash - run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache" - acceptance: runs-on: ${{ matrix.os }}-latest name: atest ${{ matrix.os }} py${{ matrix.python }} r${{ matrix.r }} @@ -332,10 +324,6 @@ jobs: path: ./build/reports if: always() - - name: Rename uncached conda packages - shell: bash - run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache" - smoke: name: smoke ${{ matrix.os }} py${{ matrix.python }} runs-on: ${{ matrix.os }}-latest From a04ec1b17131fc6285988375c65340ea9cdf3ad0 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 8 Jan 2025 17:54:51 +0100 Subject: [PATCH 5/5] fix --- .github/workflows/job.test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml index b245a8c96..52e0aef7c 100644 --- a/.github/workflows/job.test.yml +++ b/.github/workflows/job.test.yml @@ -63,6 +63,8 @@ jobs: with: environment-file: requirements/github-actions.yml mamba-version: "*" + channels: conda-forge,nodefaults + channel-priority: true - name: Install linting dependencies run: mamba env update -n test --file requirements/lint.yml @@ -238,6 +240,8 @@ jobs: python-version: ${{ matrix.python }} environment-file: requirements/github-actions.yml mamba-version: "*" + channels: conda-forge,nodefaults + channel-priority: true - name: List all packages run: conda list