https://github.com/python/cpython/commit/4c00d8542316c3db49029ff0481bfb7cafd7253a
commit: 4c00d8542316c3db49029ff0481bfb7cafd7253a
branch: main
author: Stefano Rivera <[email protected]>
committer: hugovk <[email protected]>
date: 2026-07-30T23:06:34+03:00
summary:
Some tidying for GitHub Actions (#154950)
files:
M .github/workflows/reusable-san.yml
M .github/workflows/reusable-ubuntu.yml
M .github/workflows/reusable-windows.yml
diff --git a/.github/workflows/reusable-san.yml
b/.github/workflows/reusable-san.yml
index 40464695a281af..133b8ff8d7579b 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 4ecc541e6aa7d0..2129f2f6d6e926 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
@@ -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 707b8d7efb5e0d..b1b711be4538fd 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
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
