Skip to content

Commit 6301471

Browse files
authored
[3.12] Some tidying for GitHub Actions (GH-154950) (#154998)
1 parent 1f8a87a commit 6301471

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/reusable-tsan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: TSAN option setup
4444
run: |
4545
echo "TSAN_OPTIONS=log_path=${GITHUB_WORKSPACE}/tsan_log suppressions=${GITHUB_WORKSPACE}/Tools/tsan/suppressions${{
46-
fromJSON(inputs.free-threading)
46+
inputs.free-threading
4747
&& '_free_threading'
4848
|| ''
4949
}}.txt" >> "$GITHUB_ENV"
@@ -63,7 +63,7 @@ jobs:
6363
--config-cache
6464
--with-thread-sanitizer
6565
--with-pydebug
66-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
66+
${{ inputs.free-threading && '--disable-gil' || '' }}
6767
- name: Build CPython
6868
run: make -j4
6969
- name: Display build info

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
--config-cache
8383
--with-pydebug
8484
--with-openssl="$OPENSSL_DIR"
85-
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
85+
${{ inputs.free-threading && '--disable-gil' || '' }}
8686
- name: Build CPython out-of-tree
8787
working-directory: ${{ env.CPYTHON_BUILDDIR }}
8888
run: make -j4

.github/workflows/reusable-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
.\\PCbuild\\build.bat
4141
-e -d
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
if: inputs.arch != 'arm64'

0 commit comments

Comments
 (0)