Some tidying for GitHub Actions (#154950)

diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml
index 40464695a281afd8a9fe63460d2ed2800552386b..133b8ff8d7579b4c8bb487dae45de1332a8b5da1 100644 (file)
--- 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 4ecc541e6aa7d02bf603438692e1952090594191..2129f2f6d6e926bde4e0ccf73e0dd913a3340784 100644 (file)
--- 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
@@ -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,10 +88,10 @@ 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 }}
+      if: inputs.free-threading
       working-directory: ${{ env.CPYTHON_BUILDDIR }}
       run: make -j
     - name: Build CPython out-of-tree (for compiler warning check)

diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
index 707b8d7efb5e0db2b98e3281b45ca70cfc1e931f..b1b711be4538fdaf52fb701256e34e71afb2c314 100644 (file)
--- 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