Skip to content

Commit 4807047

Browse files
committed
Revert "Update zizmor"
This reverts commit 6b9184c.
1 parent f7f9f44 commit 4807047

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/actions/build-android/action.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ runs:
1818
# The steps of a composite action are not clearly divided in the GitHub
1919
# UI, so use a single step with ::group:: markers instead.
2020
- shell: bash
21-
env:
22-
triplet: ${{ inputs.triplet }}
2321
# The `name` of a composite action step doesn't appear anywhere in the
2422
# GitHub UI, so put it in a comment on the first line instead.
2523
run: |
@@ -33,15 +31,15 @@ runs:
3331
echo "::endgroup::"
3432
3533
echo "::group::Configure host Python"
36-
./Android/android.py configure-host $triplet
34+
./Android/android.py configure-host ${{ inputs.triplet }}
3735
echo "::endgroup::"
3836
3937
echo "::group::Compile host Python"
40-
./Android/android.py make-host $triplet
38+
./Android/android.py make-host ${{ inputs.triplet }}
4139
echo "::endgroup::"
4240
4341
echo "::group::Make release package"
44-
./Android/android.py package $triplet
42+
./Android/android.py package ${{ inputs.triplet }}
4543
echo "::endgroup::"
4644
4745
if [ "$RUNNER_OS" = "Linux" ] && [ "$RUNNER_ARCH" = "X64" ]; then
@@ -55,7 +53,7 @@ runs:
5553
5654
echo "::group::Unpack release artifact"
5755
mkdir $RUNNER_TEMP/android
58-
tar -C $RUNNER_TEMP/android -xf cross-build/$triplet/dist/*
56+
tar -C $RUNNER_TEMP/android -xf cross-build/${{ inputs.triplet }}/dist/*
5957
echo "::endgroup::"
6058
6159
echo "::group::Tests"

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ jobs:
178178
free-threading: ${{ matrix.free-threading }}
179179

180180
build-windows-msi:
181-
# ${{ '' } is a hack to nest jobs under the same sidebar category.
182-
name: Windows MSI${{ '' }} # zizmor: ignore[obfuscation]
181+
name: >- # ${{ '' } is a hack to nest jobs under the same sidebar category
182+
Windows MSI${{ '' }}
183183
needs: build-context
184184
if: fromJSON(needs.build-context.outputs.run-windows-msi)
185185
strategy:
@@ -612,8 +612,8 @@ jobs:
612612
run: xvfb-run make ci
613613

614614
build-san:
615-
# ${{ '' } is a hack to nest jobs under the same sidebar category.
616-
name: Sanitizers${{ '' }} # zizmor: ignore[obfuscation]
615+
name: >- # ${{ '' } is a hack to nest jobs under the same sidebar category
616+
Sanitizers${{ '' }}
617617
needs: build-context
618618
if: needs.build-context.outputs.run-tests == 'true'
619619
strategy:

.pre-commit-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ repos:
7272
- id: actionlint
7373

7474
- repo: https://github.com/woodruffw/zizmor-pre-commit
75-
rev: v1.11.0
75+
rev: v1.6.0
7676
hooks:
7777
- id: zizmor
78+
# Action files are misidentified as workflows.
79+
exclude: ^.github/actions/
7880

7981
- repo: https://github.com/sphinx-contrib/sphinx-lint
8082
rev: v1.0.0

0 commit comments

Comments
 (0)