Skip to content

Commit 78f2271

Browse files
authored
Merge pull request #946 from martinRenou/fix_ci
Fix CI
2 parents 2540db9 + 038b783 commit 78f2271

File tree

3 files changed

+42
-21
lines changed

3 files changed

+42
-21
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
- name: Mamba install dependencies
3535
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8
3636

37-
- name: Mamba install JupyterLab 3
38-
run: mamba install jupyterlab=3 ipywidgets=7.6 openssl=1.1.1l
37+
- name: Mamba install dependencies
38+
run: mamba install jupyterlab ipywidgets openssl=1.1.1l
3939

4040
- name: Install ipyleaflet
4141
run: pip install .

.github/workflows/ui-tests.yml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: UI Tests
22

33
on: [push, pull_request]
44

5+
6+
defaults:
7+
run:
8+
shell: bash -l {0}
9+
510
jobs:
611
ui-tests:
712
name: Visual Regression
@@ -17,22 +22,30 @@ jobs:
1722
- name: Base Setup
1823
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
1924

25+
- name: Setup conda
26+
uses: conda-incubator/setup-miniconda@v2
27+
with:
28+
mamba-version: "*"
29+
channels: conda-forge
30+
31+
- name: Mamba install dependencies
32+
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8
33+
34+
- name: Mamba install dependencies
35+
run: mamba install jupyterlab ipywidgets openssl=1.1.1l
36+
2037
- name: Install ipyleaflet
21-
run: |
22-
python -m pip install --upgrade jupyterlab~=3.0 ipywidgets~=7.6
23-
python -m pip install .
24-
cd ui-tests
25-
jlpm install
38+
run: pip install .
2639

2740
- name: Install browser
2841
run: |
29-
cd ui-tests
42+
jlpm install
3043
jlpm playwright install chromium
44+
working-directory: ui-tests
3145

3246
- name: Launch JupyterLab
33-
run: |
34-
cd ui-tests
35-
jlpm start-jlab:detached > /tmp/jupyterlab_server.log 2>&1
47+
run: jlpm start-jlab:detached > /tmp/jupyterlab_server.log 2>&1
48+
working-directory: ui-tests
3649

3750
- name: Wait for JupyterLab
3851
uses: ifaxity/wait-on-action@v1
@@ -41,10 +54,8 @@ jobs:
4154
timeout: 360000
4255

4356
- name: Widget rendering tests
44-
shell: bash
45-
run: |
46-
cd ui-tests
47-
jlpm run test
57+
run: jlpm run test
58+
working-directory: ui-tests
4859

4960
- name: Upload Playwright Test assets
5061
if: always()
@@ -65,13 +76,12 @@ jobs:
6576
- name: Update snapshots
6677
if: failure()
6778
run: |
68-
cd ui-tests
6979
# remove previous snapshots from other browser
7080
jlpm rimraf "tests/**/*-snapshots/*.png"
7181
# generate new snapshots
7282
jlpm run test:update
83+
working-directory: ui-tests
7384

7485
- name: Print JupyterLab logs
7586
if: always()
76-
run: |
77-
cat /tmp/jupyterlab_server.log
87+
run: cat /tmp/jupyterlab_server.log

.github/workflows/update_galata_references.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,21 @@ jobs:
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434

35-
- name: Install dependencies
35+
- name: Setup conda
36+
uses: conda-incubator/setup-miniconda@v2
37+
with:
38+
mamba-version: "*"
39+
channels: conda-forge
40+
41+
- name: Mamba install dependencies
42+
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8
43+
44+
- name: Mamba install dependencies
45+
run: mamba install jupyterlab ipywidgets openssl=1.1.1l
46+
47+
- name: Install ipyleaflet
3648
run: |
37-
python -m pip install --upgrade jupyterlab~=3.0 ipywidgets~=7.6
38-
python -m pip install .
49+
pip install .
3950
jlpm
4051
jlpm build
4152
jupyter labextension develop . --overwrite

0 commit comments

Comments
 (0)