diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml index da2de23e4d3ec18..f4b23eed8bff573 100644 --- a/.github/workflows/reusable-san.yml +++ b/.github/workflows/reusable-san.yml @@ -55,7 +55,7 @@ jobs: run: | if [ "${SANITIZER}" = "TSan" ]; then echo "TSAN_OPTIONS=${SAN_LOG_OPTION} suppressions=${GITHUB_WORKSPACE}/Tools/tsan/suppressions${{ - fromJSON(inputs.free-threading) + inputs.free-threading && '_free_threading' || '' }}.txt handle_segv=0" >> "$GITHUB_ENV" @@ -77,7 +77,7 @@ jobs: || '--with-undefined-behavior-sanitizer' }} --with-pydebug - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} - name: Build CPython run: make -j4 - name: Display build info @@ -96,7 +96,7 @@ jobs: with: name: >- ${{ inputs.sanitizer }}-logs-${{ - fromJSON(inputs.free-threading) + inputs.free-threading && 'free-threading' || 'default' }} diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index 07c7c586c6931bf..03deb348f3a2337 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -67,7 +67,7 @@ jobs: --config-cache --with-pydebug --with-openssl="$OPENSSL_DIR" - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} - name: Build CPython out-of-tree working-directory: ${{ env.CPYTHON_BUILDDIR }} run: make -j diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml index 919ab4a4fb33b7c..74ee4513fb6b1c5 100644 --- a/.github/workflows/reusable-windows.yml +++ b/.github/workflows/reusable-windows.yml @@ -44,7 +44,7 @@ jobs: .\\PCbuild\\build.bat -e -d -v -p "${ARCH}" - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} shell: bash - name: Display build info # FIXME(diegorusso): remove the `if` if: inputs.arch != 'arm64' @@ -55,5 +55,5 @@ jobs: .\\PCbuild\\rt.bat -p "${ARCH}" -d -q --fast-ci - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} shell: bash