https://github.com/python/cpython/commit/2abc58037229f13e0776b2c16d88512fc97b5799
commit: 2abc58037229f13e0776b2c16d88512fc97b5799
branch: 3.14
author: Stefano Rivera <[email protected]>
committer: hugovk <[email protected]>
date: 2026-07-31T08:53:40+03:00
summary:
[3.14] Some tidying for GitHub Actions (GH-154950) (#154967)
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 47e41c90a1658b5..8a9c7d86462f4f5 100644
--- a/.github/workflows/reusable-san.yml
+++ b/.github/workflows/reusable-san.yml
@@ -62,7 +62,7 @@ jobs:
SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
SUPPRESSIONS_SUFFIX: >-
${{
- fromJSON(inputs.free-threading)
+ inputs.free-threading
&& '_free_threading'
|| ''
}}
@@ -106,7 +106,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
@@ -119,7 +119,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()
@@ -130,7 +130,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 6cd480b0285346d..28a176275cc4677 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -14,9 +14,9 @@ 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
permissions:
contents: read
@@ -42,7 +42,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
# For BOLT jobs, https://apt.llvm.org/llvm.sh doesn't support LLVM 19
# on Ubuntu 26.04, so stick to Ubuntu 24.04 until LLVM is upgraded.
run: |
@@ -85,10 +85,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 138e6846cb90391..6643243feeebf6c 100644
--- a/.github/workflows/reusable-windows.yml
+++ b/.github/workflows/reusable-windows.yml
@@ -40,7 +40,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
run: .\\python.bat -m test.pythoninfo
@@ -49,5 +49,5 @@ jobs:
.\\PCbuild\\rt.bat
-p "${ARCH}"
-d -q --fast-ci
- ${{ 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]
