Skip to content

Commit fca1300

Browse files
committed
Update scripts and CI config
1 parent ff97423 commit fca1300

5 files changed

Lines changed: 28 additions & 23 deletions

File tree

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ updates:
1818
commit-message:
1919
prefix: ''
2020
labels: []
21+
groups:
22+
github-actions:
23+
patterns:
24+
- '*'

.github/workflows/ci.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ concurrency:
3434

3535
jobs:
3636
miri:
37-
uses: taiki-e/github-actions/.github/workflows/miri.yml@main
37+
uses: taiki-e/github-actions/.github/workflows/miri.yml@dec917193d835117a7238865adf83273d9fcd27a # main
3838
msrv:
39-
uses: taiki-e/github-actions/.github/workflows/msrv.yml@main
39+
uses: taiki-e/github-actions/.github/workflows/msrv.yml@dec917193d835117a7238865adf83273d9fcd27a # main
4040
release-dry-run:
41-
uses: taiki-e/github-actions/.github/workflows/release-dry-run.yml@main
41+
uses: taiki-e/github-actions/.github/workflows/release-dry-run.yml@dec917193d835117a7238865adf83273d9fcd27a # main
4242
tidy:
43-
uses: taiki-e/github-actions/.github/workflows/tidy.yml@main
43+
uses: taiki-e/github-actions/.github/workflows/tidy.yml@dec917193d835117a7238865adf83273d9fcd27a # main
4444
permissions:
4545
contents: write # for creating branch for pr
4646
pull-requests: write # unused (used in `codegen-automerge: true` case)
@@ -63,8 +63,8 @@ jobs:
6363
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
6464
timeout-minutes: 60
6565
steps:
66-
- uses: taiki-e/checkout-action@v1
67-
- uses: taiki-e/github-actions/install-rust@main
66+
- uses: taiki-e/checkout-action@7d1e50e93dc4fb3bba58f85018fadf77898aee8b # v1.4.2
67+
- uses: taiki-e/github-actions/install-rust@dec917193d835117a7238865adf83273d9fcd27a # main # zizmor: ignore[stale-action-refs]
6868
with:
6969
toolchain: ${{ matrix.rust }}
7070
- run: cargo test --workspace --all-features
@@ -77,7 +77,7 @@ jobs:
7777
rustup toolchain remove 1.63 1.64 1.65
7878
cargo hack check --rust-version --workspace --locked
7979
cargo uninstall cargo-hack
80-
- uses: taiki-e/install-action@v2
80+
- uses: taiki-e/install-action@b8be7f5e140177087325943c4a8e169d01c59b3d # v2.75.3
8181
with:
8282
tool: cargo-hack,cargo-minimal-versions
8383
fallback: none
@@ -102,8 +102,10 @@ jobs:
102102
runs-on: ubuntu-latest
103103
timeout-minutes: 60
104104
steps:
105-
- uses: taiki-e/checkout-action@v1
106-
- uses: taiki-e/github-actions/install-rust@nightly
105+
- uses: taiki-e/checkout-action@7d1e50e93dc4fb3bba58f85018fadf77898aee8b # v1.4.2
106+
- uses: taiki-e/github-actions/install-rust@dec917193d835117a7238865adf83273d9fcd27a # main # zizmor: ignore[stale-action-refs]
107+
with:
108+
toolchain: nightly
107109
- run: cargo test --workspace --all-features
108110
env:
109111
CARGO_HACK_TEST_TOOLCHAIN: ${{ matrix.rust }}
@@ -119,7 +121,7 @@ jobs:
119121
timeout-minutes: 60
120122
container: alpine
121123
steps:
122-
- uses: taiki-e/checkout-action@v1
124+
- uses: taiki-e/checkout-action@7d1e50e93dc4fb3bba58f85018fadf77898aee8b # v1.4.2
123125
- name: Install Rust
124126
run: apk --no-cache add cargo
125127
- run: cargo test --workspace --all-features

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ concurrency:
2626
jobs:
2727
release:
2828
if: github.repository_owner == 'taiki-e'
29-
uses: taiki-e/github-actions/.github/workflows/rust-release.yml@main
29+
uses: taiki-e/github-actions/.github/workflows/rust-release.yml@dec917193d835117a7238865adf83273d9fcd27a # main
3030
permissions:
3131
contents: write # for taiki-e/create-gh-release-action / taiki-e/upload-rust-binary-action
3232
id-token: write # for rust-lang/crates-io-auth-action / actions/attest
3333
attestations: write # for actions/attest
3434
secrets:
35-
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}
35+
PUSH_TOKEN_APP_CLIENT_ID: ${{ secrets.PUSH_TOKEN_APP_CLIENT_ID }}
36+
PUSH_TOKEN_APP_PRIVATE_KEY: ${{ secrets.PUSH_TOKEN_APP_PRIVATE_KEY }}
3637
with:
3738
version: ${{ inputs.version }}
3839
bin: cargo-hack

.github/zizmor.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,5 @@
22
# https://docs.zizmor.sh/configuration/
33

44
rules:
5-
anonymous-definition: { disable: true }
5+
anonymous-definition: { disable: true } # This is pedantic/auditor only audit and requires explicitly naming each job, but is usually redundant.
66
dependabot-cooldown: { config: { days: 14 } }
7-
unpinned-uses:
8-
config:
9-
policies:
10-
taiki-e/*: any

tools/tidy.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ fi
2727
if [[ -n "${TIDY_DEV:-}" ]]; then
2828
image="ghcr.io/taiki-e/tidy:latest"
2929
else
30-
image="ghcr.io/taiki-e/tidy@sha256:4552cbce9426e102f9650cd9f8381e836fc8fda081dcbddcc7f31b15d48d1654"
30+
image="ghcr.io/taiki-e/tidy@sha256:bce85a4321f80c09f2b68420e9149bcf7c085130ab1e1fca54443f76833cd184"
3131
fi
3232
user="$(id -u):$(id -g)"
3333
workdir=$(pwd)
3434
tmp=$(mktemp -d)
3535
trap -- 'rm -rf -- "${tmp:?}"' EXIT
36-
mkdir -p -- "${tmp}/zizmor"
37-
touch -- "${tmp}/dummy"
38-
mkdir -- "${tmp}/dummy-dir"
36+
mkdir -p -- "${tmp}"/{pwsh-cache,pwsh-local,zizmor-cache,dummy-dir,tmp}
37+
touch -- "${tmp}"/dummy
3938
code=0
4039
color=''
4140
if [[ -t 1 ]] || [[ -n "${GITHUB_ACTIONS:-}" ]]; then
@@ -84,22 +83,25 @@ docker_run() {
8483
set +e
8584
docker_run \
8685
--mount "type=bind,source=${workdir},target=${workdir}" --workdir "${workdir}" \
86+
--mount "type=bind,source=${tmp}/tmp,target=/tmp/tidy" \
87+
--mount "type=bind,source=${tmp}/pwsh-cache,target=/.cache/powershell" \
88+
--mount "type=bind,source=${tmp}/pwsh-local,target=/.local/share/powershell" \
8789
--network=none \
8890
"${image}" \
8991
/checks/offline.sh
9092
# Some good audits requires access to GitHub API.
9193
docker_run \
9294
--mount "type=bind,source=${workdir},target=${workdir},readonly" --workdir "${workdir}" \
93-
--mount "type=bind,source=${tmp}/zizmor,target=/.cache/zizmor" \
95+
--mount "type=bind,source=${tmp}/zizmor-cache,target=/.cache/zizmor" \
9496
--env GH_TOKEN --env GITHUB_TOKEN --env ZIZMOR_GITHUB_TOKEN \
9597
"${image}" \
9698
/checks/zizmor.sh
9799
# We use remote dictionary.
98100
docker_run \
99101
--mount "type=bind,source=${workdir},target=${workdir},readonly" --workdir "${workdir}" \
100-
--mount "type=bind,source=${workdir}/.cspell.json,target=${workdir}/.cspell.json" \
101102
--mount "type=bind,source=${workdir}/.github/.cspell/project-dictionary.txt,target=${workdir}/.github/.cspell/project-dictionary.txt" \
102103
--mount "type=bind,source=${workdir}/.github/.cspell/rust-dependencies.txt,target=${workdir}/.github/.cspell/rust-dependencies.txt" \
104+
--mount "type=bind,source=${tmp}/tmp,target=/tmp/tidy" \
103105
"${image}" \
104106
/checks/cspell.sh
105107

0 commit comments

Comments
 (0)