diff options
| author | Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua> | 2024-07-21 19:09:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-21 19:09:23 (GMT) |
| commit | a3f7db905c5aecda1d06fb60ed382a17e5b9c7aa (patch) | |
| tree | d5316a38b6da9dcc1b5d659852c8a3ff20abb26b /.github | |
| parent | e88bd96d0d6cf8218c4fca37e1d20399ae676a04 (diff) | |
| download | cpython-a3f7db905c5aecda1d06fb60ed382a17e5b9c7aa.zip cpython-a3f7db905c5aecda1d06fb60ed382a17e5b9c7aa.tar.gz cpython-a3f7db905c5aecda1d06fb60ed382a17e5b9c7aa.tar.bz2 | |
Merge Ubuntu test matrices in CI (#121813)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 31 | ||||
| -rw-r--r-- | .github/workflows/reusable-ubuntu.yml | 15 |
2 files changed, 20 insertions, 26 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0298d04..7ad5964 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -242,31 +242,20 @@ jobs: os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14"]' build_ubuntu: - name: 'Ubuntu' - 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 - - build_ubuntu_free_threading: - name: 'Ubuntu (free-threading)' + 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 \ - --disable-gil + free-threading: ${{ matrix.free-threading }} build_ubuntu_ssltests: name: 'Ubuntu SSL tests with OpenSSL' @@ -578,7 +567,6 @@ jobs: - build_macos - build_macos_free_threading - build_ubuntu - - build_ubuntu_free_threading - build_ubuntu_ssltests - build_wasi - build_windows @@ -613,7 +601,6 @@ jobs: build_macos, build_macos_free_threading, build_ubuntu, - build_ubuntu_free_threading, build_ubuntu_ssltests, build_wasi, build_windows, diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index fa450ed..018a1d8 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: @@ -63,7 +65,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 |