Skip to content

Commit fc2b11a

Browse files
committed
Pass the os to reusable-ubuntu
Remove openssl and asan jobs on AArch64
1 parent 51fa3b5 commit fc2b11a

File tree

2 files changed

+20
-25
lines changed

2 files changed

+20
-25
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,19 @@ jobs:
235235
free-threading:
236236
- false
237237
- true
238+
os:
239+
- ubuntu-24.04
240+
- ubuntu-24.04-aarch64
241+
is-fork: # only used for the exclusion trick
242+
- ${{ github.repository_owner != 'python' }}
243+
exclude:
244+
- os: ubuntu-24.04-aarch64
245+
is-fork: true
238246
uses: ./.github/workflows/reusable-ubuntu.yml
239247
with:
240248
config_hash: ${{ needs.check_source.outputs.config_hash }}
241249
free-threading: ${{ matrix.free-threading }}
250+
os: ${{ matrix.os }}
242251

243252
build_ubuntu_ssltests:
244253
name: 'Ubuntu SSL tests with OpenSSL'
@@ -249,14 +258,7 @@ jobs:
249258
strategy:
250259
fail-fast: false
251260
matrix:
252-
os:
253-
- ubuntu-24.04
254-
- ubuntu-24.04-aarch64
255-
is-fork: # only used for the exclusion trick
256-
- ${{ github.repository_owner != 'python' }}
257-
exclude:
258-
- os: ubuntu-24.04-aarch64
259-
is-fork: true
261+
os: [ubuntu-24.04]
260262
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
261263
env:
262264
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -436,14 +438,7 @@ jobs:
436438
if: needs.check_source.outputs.run_tests == 'true'
437439
strategy:
438440
matrix:
439-
os:
440-
- ubuntu-24.04
441-
- ubuntu-24.04-aarch64
442-
is-fork: # only used for the exclusion trick
443-
- ${{ github.repository_owner != 'python' }}
444-
exclude:
445-
- os: ubuntu-24.04-aarch64
446-
is-fork: true
441+
os: [ubuntu-24.04]
447442
env:
448443
OPENSSL_VER: 3.0.15
449444
PYTHONSTRICTEXTENSIONBUILD: 1

.github/workflows/reusable-ubuntu.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ on:
1111
required: false
1212
type: boolean
1313
default: false
14+
os:
15+
description: OS to run the job
16+
required: true
17+
type: string
1418

1519
jobs:
1620
build_ubuntu_reusable:
17-
name: 'build and test'
21+
name: build and test (${{ inputs.os }})
1822
timeout-minutes: 60
19-
runs-on: ${{ matrix.os }}
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
os: [ubuntu-24.04, ubuntu-24.04-aarch64]
23+
runs-on: ${{ inputs.os }}
2424
env:
2525
FORCE_COLOR: 1
2626
OPENSSL_VER: 3.0.15
@@ -80,18 +80,18 @@ jobs:
8080
--with-openssl="$OPENSSL_DIR"
8181
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
8282
- name: Build CPython out-of-tree
83-
if: ${{ inputs.free-threading }}
83+
if: ${{ inputs.free-threading || inputs.os != 'ubuntu-24.04-aarch64' }}
8484
working-directory: ${{ env.CPYTHON_BUILDDIR }}
8585
run: make -j
8686
- name: Build CPython out-of-tree (for compiler warning check)
87-
if: ${{ !inputs.free-threading}}
87+
if: ${{ !inputs.free-threading && inputs.os == 'ubuntu-24.04-aarch64' }}
8888
working-directory: ${{ env.CPYTHON_BUILDDIR }}
8989
run: set -o pipefail; make -j --output-sync 2>&1 | tee compiler_output_ubuntu.txt
9090
- name: Display build info
9191
working-directory: ${{ env.CPYTHON_BUILDDIR }}
9292
run: make pythoninfo
9393
- name: Check compiler warnings
94-
if: ${{ !inputs.free-threading }}
94+
if: ${{ !inputs.free-threading && inputs.os == 'ubuntu-24.04-aarch64' }}
9595
run: >-
9696
python Tools/build/check_warnings.py
9797
--compiler-output-file-path=${{ env.CPYTHON_BUILDDIR }}/compiler_output_ubuntu.txt

0 commit comments

Comments
 (0)