https://github.com/python/cpython/commit/8d1f15712d243e03e50332abb86ff4c121814aa5
commit: 8d1f15712d243e03e50332abb86ff4c121814aa5
branch: 3.12
author: Sviatoslav Sydorenko (Святослав Сидоренко)
<[email protected]>
committer: hugovk <[email protected]>
date: 2024-07-22T08:05:41-06:00
summary:
[3.12] Merge Ubuntu test matrices in CI (GH-121813) (#122116)
files:
M .github/workflows/build.yml
M .github/workflows/reusable-ubuntu.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e043dc4da1a78f..17fc270bcc5d03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -267,17 +267,20 @@ jobs:
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14",
"macos-13"]'
build_ubuntu:
- name: 'Ubuntu'
+ name: >-
+ Ubuntu
+ ${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
+ strategy:
+ matrix:
+ free-threading:
+ - false
+ # - 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
+ free-threading: ${{ matrix.free-threading }}
build_ubuntu_ssltests:
name: 'Ubuntu SSL tests with OpenSSL'
diff --git a/.github/workflows/reusable-ubuntu.yml
b/.github/workflows/reusable-ubuntu.yml
index 0dbfcabaa8755e..dd47a380da1e77 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -4,9 +4,11 @@ on:
config_hash:
required: true
type: string
- options:
- required: true
- type: string
+ free-threading:
+ description: Whether to use free-threaded mode
+ required: false
+ type: boolean
+ default: false
jobs:
build_ubuntu_reusable:
@@ -61,7 +63,12 @@ jobs:
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{
inputs.config_hash }}
- name: Configure CPython out-of-tree
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
working-directory: ${{ env.CPYTHON_BUILDDIR }}
run: make -j4
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
