Skip to content

Commit d0e3d61

Browse files
authored
Move matplotlib fontcache update specific dependencies (#4255)
* Move matplotlib fontcache update specific dependencies * Update checkout action * Try * All green * Fix channel for emscripten 4x * Debug * Try for real * Checkout the correct branch * Try again * Do not cancel parallel run
1 parent a8306c4 commit d0e3d61

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

.github/workflows/build_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# SETUP
2525
################################################################
2626
- name: Checkout repo
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828
with:
2929
fetch-depth: 0
3030

.github/workflows/build_recipes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# SETUP
2727
################################################################
2828
- name: Checkout repo
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828

2929
- name: Checkout repo
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 0
33-
- uses: prefix-dev/setup-pixi@v0.9.0
33+
- uses: prefix-dev/setup-pixi@v0.9.0

.github/workflows/delete_package.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout repo
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121

2222
- name: Install micromamba
2323
uses: mamba-org/setup-micromamba@v2
@@ -38,5 +38,5 @@ jobs:
3838
python .github/workflows/delete_package.py \
3939
--token "$PREFIX_DEV_API_KEY" \
4040
--package "$PACKAGE_NAME" \
41-
--channel "$CHANNEL_NAME"
41+
--channel "$CHANNEL_NAME"
4242

.github/workflows/lint_recipes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout repo
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 0
2121
ref: ${{ github.sha }}

.github/workflows/new_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: (github.event_name == 'schedule' && github.repository == 'emscripten-forge/recipes') || (github.event_name != 'schedule')
1616
runs-on: [ubuntu-latest]
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
with:
2020
ref: main
2121

.github/workflows/update_matplotlib_fontcache.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,24 @@ jobs:
99

1010
update_matplotlib_fontcache:
1111
strategy:
12+
fail-fast: false
1213
matrix:
1314
branch: [main, emscripten-4x]
1415

1516
if: (github.event_name == 'schedule' && github.repository == 'emscripten-forge/recipes') || (github.event_name != 'schedule')
1617
runs-on: [ubuntu-latest]
1718
steps:
18-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
1920
with:
20-
ref: main
21+
ref: ${{ matrix.branch }}
2122

2223
- name: Install micromamba
2324
uses: mamba-org/setup-micromamba@v2
2425
with:
2526
environment-file: ci_env.yml
27+
create-args: >-
28+
microsoft::playwright
29+
pyjs_code_runner
2630
2731
- name: Update matplotlib font cache if needed
2832
shell: bash -l -eo pipefail {0}

ci_env.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: ci-env
22
channels:
33
- conda-forge
44
dependencies:
5-
- microsoft::playwright
65
- python
76
- ruamel.yaml
87
- typer
@@ -13,4 +12,3 @@ dependencies:
1312
- requests
1413
- pyyaml
1514
- pydantic
16-
- pyjs_code_runner

emci/bot/update_matplotlib_fontcache.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def update_matplotlib_fontcache(recipe_dir, target_branch_name):
7070
PREFIX_PATH,
7171
"--platform=emscripten-wasm32",
7272
"-c",
73-
"https://prefix.dev/emscripten-forge-dev",
73+
"https://prefix.dev/emscripten-forge-4x" if target_branch_name == "emscripten-4x" else "https://prefix.dev/emscripten-forge-dev",
7474
"-c",
7575
"https://prefix.dev/conda-forge",
7676
f"matplotlib={matplotlib_version}",

0 commit comments

Comments
 (0)