From 683a6b2126bc8360a1da848792fd1c595aa66e0c Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 1 Jul 2026 10:42:06 -0400 Subject: [PATCH 1/3] Tidy up YAML --- .github/workflows/reusable-ubuntu.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index 4ecc541e6aa7d02..362a280a288e011 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -14,14 +14,14 @@ on: type: boolean default: false os: - description: OS to run the job - required: true - type: string + description: OS to run the job + required: true + type: string test-opts: - description: Extra options to pass to the test runner via TESTOPTS - required: false - type: string - default: '' + description: Extra options to pass to the test runner via TESTOPTS + required: false + type: string + default: '' permissions: contents: read From 753e338e00dddde948a95912ad23bd13e15af4d9 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Fri, 3 Jul 2026 10:40:35 -0400 Subject: [PATCH 2/3] Remove some other unnecessary if: ${{}} wrapping --- .github/workflows/reusable-ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index 362a280a288e011..4a50cf986f67d6c 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -47,7 +47,7 @@ jobs: - name: Install dependencies run: sudo ./.github/workflows/posix-deps-apt.sh - name: Install Clang and BOLT - if: ${{ fromJSON(inputs.bolt-optimizations) }} + if: fromJSON(inputs.bolt-optimizations) run: | # On ubuntu-26.04 image, LLVM is LLVM-21 by default sudo apt-get install --no-install-recommends bolt-21 @@ -91,7 +91,7 @@ jobs: ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} ${{ fromJSON(inputs.bolt-optimizations) && '--enable-bolt' || '' }} - name: Build CPython out-of-tree - if: ${{ inputs.free-threading }} + if: inputs.free-threading working-directory: ${{ env.CPYTHON_BUILDDIR }} run: make -j - name: Build CPython out-of-tree (for compiler warning check) From 693c0402c67a1ff19812277b5745add34b2d7ba6 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Thu, 30 Jul 2026 15:08:21 -0300 Subject: [PATCH 3/3] Remove unnecessary fromJSON() on inputs --- .github/workflows/reusable-san.yml | 8 ++++---- .github/workflows/reusable-ubuntu.yml | 6 +++--- .github/workflows/reusable-windows.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml index 40464695a281afd..133b8ff8d7579b4 100644 --- a/.github/workflows/reusable-san.yml +++ b/.github/workflows/reusable-san.yml @@ -55,7 +55,7 @@ jobs: SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log SUPPRESSIONS_SUFFIX: >- ${{ - fromJSON(inputs.free-threading) + inputs.free-threading && '_free_threading' || '' }} @@ -101,7 +101,7 @@ jobs: }} --with-pydebug ${{ inputs.sanitizer == 'TSan' && '--with-openssl="$OPENSSL_DIR" --with-openssl-rpath=auto' || '' }} - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} - name: Build CPython run: make -j4 - name: Display build info @@ -114,7 +114,7 @@ jobs: - name: Parallel tests if: >- inputs.sanitizer == 'TSan' - && fromJSON(inputs.free-threading) + && inputs.free-threading run: ./python -m test --tsan-parallel --parallel-threads=4 -j4 -W --timeout=600 --slowest - name: Display logs if: always() @@ -125,7 +125,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 4a50cf986f67d6c..2129f2f6d6e926b 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -47,7 +47,7 @@ jobs: - name: Install dependencies run: sudo ./.github/workflows/posix-deps-apt.sh - name: Install Clang and BOLT - if: fromJSON(inputs.bolt-optimizations) + if: inputs.bolt-optimizations run: | # On ubuntu-26.04 image, LLVM is LLVM-21 by default sudo apt-get install --no-install-recommends bolt-21 @@ -88,8 +88,8 @@ jobs: --enable-slower-safety --enable-safety --with-openssl="$OPENSSL_DIR" - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} - ${{ fromJSON(inputs.bolt-optimizations) && '--enable-bolt' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} + ${{ inputs.bolt-optimizations && '--enable-bolt' || '' }} - name: Build CPython out-of-tree if: inputs.free-threading working-directory: ${{ env.CPYTHON_BUILDDIR }} diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml index 707b8d7efb5e0db..b1b711be4538fda 100644 --- a/.github/workflows/reusable-windows.yml +++ b/.github/workflows/reusable-windows.yml @@ -45,7 +45,7 @@ jobs: -e -v ${{ inputs.interpreter == 'switch-case' && '-d' || '--tail-call-interp -c Release' }} -p "${ARCH}" - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} shell: bash - name: Display build info run: .\\python.bat -m test.pythoninfo @@ -55,5 +55,5 @@ jobs: -p "${ARCH}" -q --fast-ci ${{ inputs.interpreter == 'switch-case' && '-d' || '' }} - ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} + ${{ inputs.free-threading && '--disable-gil' || '' }} shell: bash