Skip to content

Commit fea338b

Browse files
authored
[3.13] Some tidying for GitHub Actions (GH-154950) (#154995)
1 parent f61137a commit fea338b

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/reusable-san.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: |
5656
if [ "${SANITIZER}" = "TSan" ]; then
5757
echo "TSAN_OPTIONS=${SAN_LOG_OPTION} suppressions=${GITHUB_WORKSPACE}/Tools/tsan/suppressions${{
58-
fromJSON(inputs.free-threading)
58+
inputs.free-threading
5959
&& '_free_threading'
6060
|| ''
6161
}}.txt handle_segv=0" >> "$GITHUB_ENV"
@@ -77,7 +77,7 @@ jobs:
7777
|| '--with-undefined-behavior-sanitizer'
7878
}}
7979
--with-pydebug
80-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
80+
${{ inputs.free-threading && '--disable-gil' || '' }}
8181
- name: Build CPython
8282
run: make -j4
8383
- name: Display build info
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
name: >-
9898
${{ inputs.sanitizer }}-logs-${{
99-
fromJSON(inputs.free-threading)
99+
inputs.free-threading
100100
&& 'free-threading'
101101
|| 'default'
102102
}}

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
--config-cache
6868
--with-pydebug
6969
--with-openssl="$OPENSSL_DIR"
70-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
70+
${{ inputs.free-threading && '--disable-gil' || '' }}
7171
- name: Build CPython out-of-tree
7272
working-directory: ${{ env.CPYTHON_BUILDDIR }}
7373
run: make -j

.github/workflows/reusable-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
.\\PCbuild\\build.bat
4545
-e -d -v
4646
-p "${ARCH}"
47-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
47+
${{ inputs.free-threading && '--disable-gil' || '' }}
4848
shell: bash
4949
- name: Display build info # FIXME(diegorusso): remove the `if`
5050
if: inputs.arch != 'arm64'
@@ -55,5 +55,5 @@ jobs:
5555
.\\PCbuild\\rt.bat
5656
-p "${ARCH}"
5757
-d -q --fast-ci
58-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
58+
${{ inputs.free-threading && '--disable-gil' || '' }}
5959
shell: bash

0 commit comments

Comments
 (0)