Skip to content

Commit 3092b9c

Browse files
Hugo's review
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent d558219 commit 3092b9c

2 files changed

Lines changed: 11 additions & 20 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,12 @@ jobs:
261261
os: ${{ matrix.os }}
262262
test-opts: ${{ matrix.test-opts || '' }}
263263

264+
build-ubuntu-installed:
265+
name: 'Ubuntu (installed)'
266+
needs: build-context
267+
if: needs.build-context.outputs.run-ubuntu == 'true'
268+
uses: ./.github/workflows/reusable-install.yml
269+
264270
build-ubuntu-ssltests:
265271
name: 'Ubuntu SSL tests'
266272
runs-on: ${{ matrix.os }}
@@ -382,14 +388,6 @@ jobs:
382388
if: needs.build-context.outputs.run-wasi == 'true'
383389
uses: ./.github/workflows/reusable-wasi.yml
384390

385-
build-ubuntu-installed:
386-
name: 'Ubuntu (installed)'
387-
needs: build-context
388-
if: needs.build-context.outputs.run-ubuntu == 'true'
389-
uses: ./.github/workflows/reusable-install.yml
390-
with:
391-
os: ubuntu-26.04-arm
392-
393391
test-hypothesis:
394392
name: "Hypothesis tests on Ubuntu"
395393
runs-on: ubuntu-26.04

.github/workflows/reusable-install.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
name: Reusable Ubuntu (Installed)
1+
name: Reusable Ubuntu (installed)
22

33
on:
44
workflow_call:
5-
inputs:
6-
os:
7-
description: OS to run the job
8-
required: true
9-
type: string
105

116
permissions:
127
contents: read
@@ -16,17 +11,15 @@ env:
1611

1712
jobs:
1813
build-install-test:
19-
name: build, install and test (${{ inputs.os }})
20-
runs-on: ${{ inputs.os }}
14+
name: build, install and test
15+
runs-on: ubuntu-26.04-arm
2116
timeout-minutes: 60
2217
env:
2318
PYTHONSTRICTEXTENSIONBUILD: 1
2419
steps:
25-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2621
with:
2722
persist-credentials: false
28-
- name: Runner image version
29-
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
3023
- name: Register gcc problem matcher
3124
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
3225
- name: Set install dir
@@ -48,4 +41,4 @@ jobs:
4841
run: |
4942
"$INSTALLED_PYTHON" -m test.pythoninfo
5043
- name: Test the installed Python
51-
run: xvfb-run "$INSTALLED_PYTHON" -m test -j0 --fast-ci --timeout=900
44+
run: xvfb-run "$INSTALLED_PYTHON" -m test --fast-ci --timeout=900

0 commit comments

Comments
 (0)