mirror of https://github.com/python/cpython
Merge Ubuntu test matrices in CI (#121813)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
This commit is contained in:
parent
e88bd96d0d
commit
a3f7db905c
|
@ -242,31 +242,20 @@ jobs:
|
||||||
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14"]'
|
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14"]'
|
||||||
|
|
||||||
build_ubuntu:
|
build_ubuntu:
|
||||||
name: 'Ubuntu'
|
name: >-
|
||||||
|
Ubuntu
|
||||||
|
${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
|
||||||
needs: check_source
|
needs: check_source
|
||||||
if: needs.check_source.outputs.run_tests == 'true'
|
if: needs.check_source.outputs.run_tests == 'true'
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
free-threading:
|
||||||
|
- false
|
||||||
|
- true
|
||||||
uses: ./.github/workflows/reusable-ubuntu.yml
|
uses: ./.github/workflows/reusable-ubuntu.yml
|
||||||
with:
|
with:
|
||||||
config_hash: ${{ needs.check_source.outputs.config_hash }}
|
config_hash: ${{ needs.check_source.outputs.config_hash }}
|
||||||
options: |
|
free-threading: ${{ matrix.free-threading }}
|
||||||
../cpython-ro-srcdir/configure \
|
|
||||||
--config-cache \
|
|
||||||
--with-pydebug \
|
|
||||||
--with-openssl=$OPENSSL_DIR
|
|
||||||
|
|
||||||
build_ubuntu_free_threading:
|
|
||||||
name: 'Ubuntu (free-threading)'
|
|
||||||
needs: check_source
|
|
||||||
if: needs.check_source.outputs.run_tests == 'true'
|
|
||||||
uses: ./.github/workflows/reusable-ubuntu.yml
|
|
||||||
with:
|
|
||||||
config_hash: ${{ needs.check_source.outputs.config_hash }}
|
|
||||||
options: |
|
|
||||||
../cpython-ro-srcdir/configure \
|
|
||||||
--config-cache \
|
|
||||||
--with-pydebug \
|
|
||||||
--with-openssl=$OPENSSL_DIR \
|
|
||||||
--disable-gil
|
|
||||||
|
|
||||||
build_ubuntu_ssltests:
|
build_ubuntu_ssltests:
|
||||||
name: 'Ubuntu SSL tests with OpenSSL'
|
name: 'Ubuntu SSL tests with OpenSSL'
|
||||||
|
@ -578,7 +567,6 @@ jobs:
|
||||||
- build_macos
|
- build_macos
|
||||||
- build_macos_free_threading
|
- build_macos_free_threading
|
||||||
- build_ubuntu
|
- build_ubuntu
|
||||||
- build_ubuntu_free_threading
|
|
||||||
- build_ubuntu_ssltests
|
- build_ubuntu_ssltests
|
||||||
- build_wasi
|
- build_wasi
|
||||||
- build_windows
|
- build_windows
|
||||||
|
@ -613,7 +601,6 @@ jobs:
|
||||||
build_macos,
|
build_macos,
|
||||||
build_macos_free_threading,
|
build_macos_free_threading,
|
||||||
build_ubuntu,
|
build_ubuntu,
|
||||||
build_ubuntu_free_threading,
|
|
||||||
build_ubuntu_ssltests,
|
build_ubuntu_ssltests,
|
||||||
build_wasi,
|
build_wasi,
|
||||||
build_windows,
|
build_windows,
|
||||||
|
|
|
@ -4,9 +4,11 @@ on:
|
||||||
config_hash:
|
config_hash:
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
options:
|
free-threading:
|
||||||
required: true
|
description: Whether to use free-threaded mode
|
||||||
type: string
|
required: false
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_ubuntu_reusable:
|
build_ubuntu_reusable:
|
||||||
|
@ -63,7 +65,12 @@ jobs:
|
||||||
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
|
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
|
||||||
- name: Configure CPython out-of-tree
|
- name: Configure CPython out-of-tree
|
||||||
working-directory: ${{ env.CPYTHON_BUILDDIR }}
|
working-directory: ${{ env.CPYTHON_BUILDDIR }}
|
||||||
run: ${{ inputs.options }}
|
run: >-
|
||||||
|
../cpython-ro-srcdir/configure
|
||||||
|
--config-cache
|
||||||
|
--with-pydebug
|
||||||
|
--with-openssl=$OPENSSL_DIR
|
||||||
|
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
|
||||||
- name: Build CPython out-of-tree
|
- name: Build CPython out-of-tree
|
||||||
working-directory: ${{ env.CPYTHON_BUILDDIR }}
|
working-directory: ${{ env.CPYTHON_BUILDDIR }}
|
||||||
run: make -j4
|
run: make -j4
|
||||||
|
|
Loading…
Reference in New Issue