Skip to content

Commit a4fb737

Browse files
committed
clean up some use of setup-miniconda
1 parent ac35714 commit a4fb737

File tree

2 files changed

+13
-41
lines changed

2 files changed

+13
-41
lines changed

.github/.condarc

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/job.test.yml

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,6 @@ jobs:
5858
lab: '${{ matrix.lab }}'
5959
nodejs: '${{ matrix.nodejs }}'
6060

61-
- name: Cache conda
62-
uses: actions/cache@v3
63-
with:
64-
path: ~/conda_pkgs_dir
65-
key: |
66-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-lint-${{ hashFiles('requirements/github-actions.yml', 'requirements/lint.yml') }}
67-
restore-keys: |
68-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-lint-
69-
7061
- name: Set up Python and mamba
7162
uses: conda-incubator/setup-miniconda@v2
7263
with:
@@ -122,6 +113,10 @@ jobs:
122113
- name: Check distributions
123114
run: python scripts/distcheck.py
124115

116+
- name: Rename uncached conda packages
117+
shell: bash
118+
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
119+
125120
build:
126121
name: build
127122
runs-on: ${{ matrix.os }}-latest
@@ -143,19 +138,11 @@ jobs:
143138
lab: '${{ matrix.lab }}'
144139
nodejs: '${{ matrix.nodejs }}'
145140

146-
- name: Cache conda
147-
uses: actions/cache@v3
148-
with:
149-
path: ~/conda_pkgs_dir
150-
key: |
151-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-build-${{ hashFiles('requirements/github-actions.yml') }}
152-
restore-keys: |
153-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-build-
154-
155141
- name: Set up Python and mamba
156142
uses: conda-incubator/setup-miniconda@v2
157143
with:
158144
miniforge-variant: Mambaforge
145+
use-mamba: true
159146

160147
- name: Install minimal build deps
161148
run: mamba install -n test -c conda-forge setuptools wheel 'jupyterlab${{ matrix.lab }}' 'nodejs${{ matrix.nodejs }}'
@@ -214,6 +201,10 @@ jobs:
214201
name: jupyterlab-lsp dist ${{ github.run_number }}
215202
path: ./dist
216203

204+
- name: Rename uncached conda packages
205+
shell: bash
206+
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
207+
217208
acceptance:
218209
runs-on: ${{ matrix.os }}-latest
219210
name: atest ${{ matrix.os }} py${{ matrix.python }} r${{ matrix.r }}
@@ -250,15 +241,6 @@ jobs:
250241
lab: '${{ matrix.lab }}'
251242
nodejs: '${{ matrix.nodejs }}'
252243

253-
- name: Cache conda
254-
uses: actions/cache@v3
255-
with:
256-
path: ~/conda_pkgs_dir
257-
key: |
258-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-${{ matrix.python }}-atest-${{ hashFiles('requirements/github-actions.yml') }}
259-
restore-keys: |
260-
${{ env.CACHE_EPOCH }}-${{ matrix.os }}-${{ matrix.python }}-atest-
261-
262244
- name: Set up Python and mamba
263245
uses: conda-incubator/setup-miniconda@v2
264246
with:
@@ -357,6 +339,10 @@ jobs:
357339
path: ./atest/output
358340
if: always()
359341

342+
- name: Rename uncached conda packages
343+
shell: bash
344+
run: mv "${CONDA_PKGS_DIR}" "${CONDA_PKGS_DIR}_do_not_cache"
345+
360346
smoke:
361347
name: smoke ${{ matrix.os }} py${{ matrix.python }}
362348
runs-on: ${{ matrix.os }}-latest

0 commit comments

Comments
 (0)