Skip to content

Commit e65cc2a

Browse files
committed
workflows: build-matplotlib: patch source, simplify python-wheels path
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
1 parent 244ccf3 commit e65cc2a

1 file changed

Lines changed: 17 additions & 11 deletions

File tree

.github/workflows/build-matplotlib.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ jobs:
4141
SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }}
4242

4343
steps:
44-
- name: Checkout python-wheels
45-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
46-
with:
47-
path: python-wheels-repo
48-
persist-credentials: false
49-
5044
- name: Checkout matplotlib v${{ env.MPL_VERSION }}
5145
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5246
with:
@@ -55,13 +49,25 @@ jobs:
5549
fetch-depth: 0
5650
persist-credentials: false
5751

58-
- uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
59-
name: Install Python
52+
- name: Checkout python-wheels
53+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
54+
with:
55+
path: python-wheels
56+
persist-credentials: false
57+
58+
- name: Install Python
59+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
6060
with:
6161
python-version: '3.12'
6262
activate-environment: true
6363
enable-cache: false
6464

65+
# We need to patch the matplotlib source to increase a threading test
66+
# timeout for the native runners
67+
- name: patch matplotlib source
68+
run: |
69+
git apply python-wheels/patches/matplotlib/${{ env.MPL_VERSION }}/00*.patch
70+
6571
# Something changed somewhere that prevents the downloaded-at-build-time
6672
# licenses from being included in built wheels, so pre-download them so
6773
# that they exist before the build and are included.
@@ -100,7 +106,7 @@ jobs:
100106
- name: Checkout python-wheels
101107
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
102108
with:
103-
path: python-wheels-repo
109+
path: python-wheels
104110
persist-credentials: false
105111

106112
- name: Download sdist
@@ -175,7 +181,7 @@ jobs:
175181
- name: Checkout python-wheels
176182
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
177183
with:
178-
path: python-wheels-repo
184+
path: python-wheels
179185
persist-credentials: false
180186

181187
- name: Download wheels
@@ -185,7 +191,7 @@ jobs:
185191
path: dist
186192

187193
- name: Publish to GitLab PyPI registry
188-
uses: ./python-wheels-repo/actions/publish-to-gitlab
194+
uses: ./python-wheels/actions/publish-to-gitlab
189195
with:
190196
gitlab-username: ${{ vars.GITLAB_DEPLOY_USER }}
191197
gitlab-token: ${{ secrets.GITLAB_DEPLOY_TOKEN }}

0 commit comments

Comments
 (0)