Skip to content

Commit 2abc580

Browse files
authored
[3.14] Some tidying for GitHub Actions (GH-154950) (#154967)
1 parent 91abbe6 commit 2abc580

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/reusable-san.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
6363
SUPPRESSIONS_SUFFIX: >-
6464
${{
65-
fromJSON(inputs.free-threading)
65+
inputs.free-threading
6666
&& '_free_threading'
6767
|| ''
6868
}}
@@ -106,7 +106,7 @@ jobs:
106106
}}
107107
--with-pydebug
108108
${{ inputs.sanitizer == 'TSan' && '--with-openssl="$OPENSSL_DIR" --with-openssl-rpath=auto' || '' }}
109-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
109+
${{ inputs.free-threading && '--disable-gil' || '' }}
110110
- name: Build CPython
111111
run: make -j4
112112
- name: Display build info
@@ -119,7 +119,7 @@ jobs:
119119
- name: Parallel tests
120120
if: >-
121121
inputs.sanitizer == 'TSan'
122-
&& fromJSON(inputs.free-threading)
122+
&& inputs.free-threading
123123
run: ./python -m test --tsan-parallel --parallel-threads=4 -j4 -W --timeout=600 --slowest
124124
- name: Display logs
125125
if: always()
@@ -130,7 +130,7 @@ jobs:
130130
with:
131131
name: >-
132132
${{ inputs.sanitizer }}-logs-${{
133-
fromJSON(inputs.free-threading)
133+
inputs.free-threading
134134
&& 'free-threading'
135135
|| 'default'
136136
}}

.github/workflows/reusable-ubuntu.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ on:
1414
type: boolean
1515
default: false
1616
os:
17-
description: OS to run the job
18-
required: true
19-
type: string
17+
description: OS to run the job
18+
required: true
19+
type: string
2020

2121
permissions:
2222
contents: read
@@ -42,7 +42,7 @@ jobs:
4242
- name: Install dependencies
4343
run: sudo ./.github/workflows/posix-deps-apt.sh
4444
- name: Install Clang and BOLT
45-
if: ${{ fromJSON(inputs.bolt-optimizations) }}
45+
if: inputs.bolt-optimizations
4646
# For BOLT jobs, https://apt.llvm.org/llvm.sh doesn't support LLVM 19
4747
# on Ubuntu 26.04, so stick to Ubuntu 24.04 until LLVM is upgraded.
4848
run: |
@@ -85,10 +85,10 @@ jobs:
8585
--enable-slower-safety
8686
--enable-safety
8787
--with-openssl="$OPENSSL_DIR"
88-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
89-
${{ fromJSON(inputs.bolt-optimizations) && '--enable-bolt' || '' }}
88+
${{ inputs.free-threading && '--disable-gil' || '' }}
89+
${{ inputs.bolt-optimizations && '--enable-bolt' || '' }}
9090
- name: Build CPython out-of-tree
91-
if: ${{ inputs.free-threading }}
91+
if: inputs.free-threading
9292
working-directory: ${{ env.CPYTHON_BUILDDIR }}
9393
run: make -j
9494
- name: Build CPython out-of-tree (for compiler warning check)

.github/workflows/reusable-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
.\\PCbuild\\build.bat
4141
-e -d -v
4242
-p "${ARCH}"
43-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
43+
${{ inputs.free-threading && '--disable-gil' || '' }}
4444
shell: bash
4545
- name: Display build info
4646
run: .\\python.bat -m test.pythoninfo
@@ -49,5 +49,5 @@ jobs:
4949
.\\PCbuild\\rt.bat
5050
-p "${ARCH}"
5151
-d -q --fast-ci
52-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
52+
${{ inputs.free-threading && '--disable-gil' || '' }}
5353
shell: bash

0 commit comments

Comments
 (0)