Skip to content

Commit 4b33fdd

Browse files
authored
Merge pull request #10176 from Turbo87/zizmor
CI: Fix zizmor issues
2 parents 46b963b + 4c4dfe2 commit 4b33fdd

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030

3131
steps:
3232
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
with:
34+
persist-credentials: false
3335

3436
- uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366 # v45.0.5
3537
id: changed-files-non-js
@@ -97,6 +99,8 @@ jobs:
9799

98100
steps:
99101
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
102+
with:
103+
persist-credentials: false
100104

101105
- run: rustup component add rustfmt
102106
- run: rustup component add clippy
@@ -115,10 +119,12 @@ jobs:
115119

116120
steps:
117121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
122+
with:
123+
persist-credentials: false
118124

119125
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
120126

121-
- run: cargo install cargo-deny --vers ${{ env.CARGO_DENY_VERSION }}
127+
- run: cargo install cargo-deny --vers ${CARGO_DENY_VERSION}
122128
- run: cargo deny check
123129

124130
backend-test:
@@ -136,33 +142,36 @@ jobs:
136142

137143
steps:
138144
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
145+
with:
146+
persist-credentials: false
147+
139148
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
140149
with:
141150
# Ensure that we cache from the right target directory. (See below
142151
# for the details of how and when this gets created.)
143152
workspaces: '. -> ${{ env.CARGO_TARGET_DIR }}'
144153

145154
# Update `pg_dump` to the same version as the running PostgreSQL server
146-
- run: sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -v ${{ env.POSTGRES_VERSION }} -i -p
155+
- run: sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -v ${POSTGRES_VERSION} -i -p
147156
- run: sudo systemctl start postgresql.service
148157
- run: sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres'"
149158

150159
# Create a working directory on /mnt, which is a larger temporary
151160
# filesystem than /, that we can then point our later commands to.
152161
- run: |
153-
sudo mkdir ${{ env.CARGO_TARGET_DIR }}
154-
sudo chown $(id -u):$(id -g) ${{ env.CARGO_TARGET_DIR }}
162+
sudo mkdir ${CARGO_TARGET_DIR}
163+
sudo chown $(id -u):$(id -g) ${CARGO_TARGET_DIR}
155164
156165
- run: cargo build --tests --workspace
157166
- run: cargo test --workspace
158167

159-
- run: curl -sL https://github.com/mozilla/grcov/releases/download/v${{ env.GRCOV_VERSION }}/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar xjf -
168+
- run: curl -sL https://github.com/mozilla/grcov/releases/download/v${GRCOV_VERSION}/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar xjf -
160169
- run: rustup component add llvm-tools
161-
- run: ./grcov . --binary-path ${{ env.CARGO_TARGET_DIR }}/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" --ignore "${{ env.CARGO_TARGET_DIR }}/debug/build/**" -o ${{ env.CARGO_TARGET_DIR }}/coverage.lcov
170+
- run: ./grcov . --binary-path ${CARGO_TARGET_DIR}/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" --ignore "${CARGO_TARGET_DIR}/debug/build/**" -o ${CARGO_TARGET_DIR}/coverage.lcov
162171

163172
- uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
164173
with:
165-
files: ${{ env.CARGO_TARGET_DIR }}/coverage.lcov
174+
files: ${CARGO_TARGET_DIR}/coverage.lcov
166175
env:
167176
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
168177

@@ -174,6 +183,8 @@ jobs:
174183

175184
steps:
176185
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
186+
with:
187+
persist-credentials: false
177188

178189
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
179190
with:
@@ -208,6 +219,8 @@ jobs:
208219

209220
steps:
210221
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
222+
with:
223+
persist-credentials: false
211224

212225
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
213226
with:
@@ -244,6 +257,8 @@ jobs:
244257

245258
steps:
246259
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
260+
with:
261+
persist-credentials: false
247262

248263
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
249264
with:

.github/workflows/smoke-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
with:
20+
persist-credentials: false
21+
1922
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
2023
- run: cargo build --package crates_io_smoke_test
2124
- run: cargo run --package crates_io_smoke_test --quiet

0 commit comments

Comments
 (0)