From 5a511711b8fbcb1ce9aa7dc04164167a298aca2b Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Fri, 31 Jul 2026 06:49:06 -0700 Subject: [PATCH] [3.12] Some tidying for GitHub Actions (GH-154950) (cherry picked from commit fea338b7206f44e45eecf37100314e9939b7974a) Co-authored-by: Stefano Rivera --- .github/workflows/reusable-tsan.yml | 4 ++-- .github/workflows/reusable-ubuntu.yml | 2 +- .github/workflows/reusable-windows.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-tsan.yml b/.github/workflows/reusable-tsan.yml index e11cc58f815c412..595e636bd05d75c 100644 --- a/.github/workflows/reusable-tsan.yml +++ b/.github/workflows/reusable-tsan.yml @@ -43,7 +43,7 @@ jobs: - name: TSAN option setup run: | echo "TSAN_OPTIONS=log_path=${GITHUB_WORKSPACE}/tsan_log suppressions=${GITHUB_WORKSPACE}/Tools/tsan/suppressions${{ - fromJSON(inputs.free-threading) + inputs.free-threading && '_free_threading' || '' }}.txt" >> "$GITHUB_ENV" @@ -63,7 +63,7 @@ jobs: --config-cache --with-thread-sanitizer --with-pydebug - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} - name: Build CPython run: make -j4 - name: Display build info diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index 61afb38e77d9170..8c37297f8cc4cef 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -82,7 +82,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 -j4 diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml index 6c2b016a2c61c0d..e26674164907ad9 100644 --- a/.github/workflows/reusable-windows.yml +++ b/.github/workflows/reusable-windows.yml @@ -40,7 +40,7 @@ jobs: .\\PCbuild\\build.bat -e -d -p "${ARCH}" - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} shell: bash - name: Display build info if: inputs.arch != 'arm64'