Commit 8d1f157
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -267,17 +267,20 @@ jobs: | |||
| 267 | 267 | os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14", "macos-13"]' | |
| 268 | 268 | ||
| 269 | 269 | build_ubuntu: | |
| 270 | - name: 'Ubuntu' | ||
| 270 | + name: >- | ||
| 271 | + Ubuntu | ||
| 272 | + ${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }} | ||
| 271 | 273 | needs: check_source | |
| 272 | 274 | if: needs.check_source.outputs.run_tests == 'true' | |
| 275 | + strategy: | ||
| 276 | + matrix: | ||
| 277 | + free-threading: | ||
| 278 | + - false | ||
| 279 | + # - true | ||
| 273 | 280 | uses: ./.github/workflows/reusable-ubuntu.yml | |
| 274 | 281 | with: | |
| 275 | 282 | config_hash: ${{ needs.check_source.outputs.config_hash }} | |
| 276 | - options: | | ||
| 277 | - ../cpython-ro-srcdir/configure \ | ||
| 278 | - --config-cache \ | ||
| 279 | - --with-pydebug \ | ||
| 280 | - --with-openssl=$OPENSSL_DIR | ||
| 283 | + free-threading: ${{ matrix.free-threading }} | ||
| 281 | 284 | ||
| 282 | 285 | build_ubuntu_ssltests: | |
| 283 | 286 | name: 'Ubuntu SSL tests with OpenSSL' | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,9 +4,11 @@ on: | |||
| 4 | 4 | config_hash: | |
| 5 | 5 | required: true | |
| 6 | 6 | type: string | |
| 7 | - options: | ||
| 8 | - required: true | ||
| 9 | - type: string | ||
| 7 | + free-threading: | ||
| 8 | + description: Whether to use free-threaded mode | ||
| 9 | + required: false | ||
| 10 | + type: boolean | ||
| 11 | + default: false | ||
| 10 | 12 | ||
| 11 | 13 | jobs: | |
| 12 | 14 | build_ubuntu_reusable: | |
@@ -61,7 +63,12 @@ jobs: | |||
| 61 | 63 | key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }} | |
| 62 | 64 | - name: Configure CPython out-of-tree | |
| 63 | 65 | working-directory: ${{ env.CPYTHON_BUILDDIR }} | |
| 64 | - run: ${{ inputs.options }} | ||
| 66 | + run: >- | ||
| 67 | + ../cpython-ro-srcdir/configure | ||
| 68 | + --config-cache | ||
| 69 | + --with-pydebug | ||
| 70 | + --with-openssl=$OPENSSL_DIR | ||
| 71 | + ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} | ||
| 65 | 72 | - name: Build CPython out-of-tree | |
| 66 | 73 | working-directory: ${{ env.CPYTHON_BUILDDIR }} | |
| 67 | 74 | run: make -j4 | |
0 commit comments