Skip to content

[3.12] Merge Ubuntu test matrices in CI (GH-121813) #122116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2024
Merged

[3.12] Merge Ubuntu test matrices in CI (GH-121813) #122116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,17 +253,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:
Copy link
Member

@hugovk hugovk Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no free-threading in 3.12.

The Windows 3.12 backport included free-threading things in reusable-windows.yml but build.yml didn't mention it.

Copy link
Member

@hugovk hugovk Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... because the #121776 backport hasn't been merged yet :)

But that comments out the free-threading: true job. Do the same here?

Copy link
Contributor Author

@webknjaz webknjaz Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But that comments out the free-threading: true job. Do the same here?

Yes! I forgot about that one, only fixed the merge conflicts. I left it commented out to facilitate any future backports, reducing possible conflicts.

Copy link
Contributor Author

@webknjaz webknjaz Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering why that doesn't fail the CI and saw this:

configure: WARNING: unrecognized options: --disable-gil

@hugovk any reason invalid flags don't crash the build process?

Copy link
Contributor Author

@webknjaz webknjaz Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented out that matrix factor. Marking this thread as resolved.

Copy link
Member

@hugovk hugovk Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering why that doesn't fail the CI and saw this:

configure: WARNING: unrecognized options: --disable-gil

@hugovk any reason invalid flags don't crash the build process?

Let's ask @erlend-aasland

- 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'
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/reusable-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down