Skip to content

Commit 98777ab

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fork/mansona/template-tag-codemod
2 parents 1efb471 + 98d2090 commit 98777ab

File tree

57 files changed

+1689
-1623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1689
-1623
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- main
77
- master
8-
- binstall
98

109
pull_request:
1110

@@ -17,28 +16,26 @@ concurrency:
1716

1817
env:
1918
CARGO_TERM_COLOR: always
20-
# renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
21-
BINSTALL_VERSION: 1.14.3
2219
# renovate: datasource=crate depName=cargo-deny versioning=semver
23-
CARGO_DENY_VERSION: 0.18.3
20+
CARGO_DENY_VERSION: 0.18.4
2421
# renovate: datasource=crate depName=cargo-machete versioning=semver
25-
CARGO_MACHETE_VERSION: 0.8.0
22+
CARGO_MACHETE_VERSION: 0.9.1
2623
# renovate: datasource=github-releases depName=shssoichiro/oxipng versioning=semver
2724
OXIPNG_VERSION: 9.1.5
2825
# renovate: datasource=npm depName=pnpm
29-
PNPM_VERSION: 10.14.0
26+
PNPM_VERSION: 10.15.0
3027
# renovate: datasource=github-releases depName=typst/typst versioning=semver
3128
TYPST_VERSION: 0.13.1
3229
# renovate: datasource=pypi depName=zizmor
33-
ZIZMOR_VERSION: 1.11.0
30+
ZIZMOR_VERSION: 1.12.1
3431

3532
jobs:
3633
changed-files:
3734
name: Changed Files
3835
runs-on: ubuntu-24.04
3936

4037
steps:
41-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4239
with:
4340
persist-credentials: false
4441
# This is needed to get the commit history for the changed-files action
@@ -116,7 +113,7 @@ jobs:
116113
RUSTDOCFLAGS: "-D warnings"
117114

118115
steps:
119-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
116+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
120117
with:
121118
persist-credentials: false
122119

@@ -138,20 +135,18 @@ jobs:
138135
if: github.event_name != 'pull_request' || needs.changed-files.outputs.rust-lockfile == 'true'
139136

140137
steps:
141-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
138+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
142139
with:
143140
persist-credentials: false
144141

145142
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
146143
with:
147144
save-if: ${{ github.ref == 'refs/heads/main' }}
148145

149-
- run: curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/v${BINSTALL_VERSION}/install-from-binstall-release.sh | bash
150-
151-
- run: cargo binstall cargo-deny@${CARGO_DENY_VERSION}
146+
- run: cargo install cargo-deny --vers ${CARGO_DENY_VERSION}
152147
- run: cargo deny check
153148

154-
- run: cargo binstall cargo-machete@${CARGO_MACHETE_VERSION}
149+
- run: cargo install cargo-machete --vers ${CARGO_MACHETE_VERSION}
155150
- run: cargo machete
156151

157152
backend-test:
@@ -167,7 +162,7 @@ jobs:
167162
MALLOC_CONF: "background_thread:true,abort_conf:true,abort:true,junk:true"
168163

169164
steps:
170-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
165+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
171166
with:
172167
persist-credentials: false
173168

@@ -215,7 +210,7 @@ jobs:
215210
if: needs.changed-files.outputs.non-rust == 'true'
216211

217212
steps:
218-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
213+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
219214
with:
220215
persist-credentials: false
221216

@@ -251,7 +246,7 @@ jobs:
251246
PERCY_PARALLEL_TOTAL: 2
252247

253248
steps:
254-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
249+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
255250
with:
256251
persist-credentials: false
257252

@@ -279,7 +274,7 @@ jobs:
279274
if: needs.changed-files.outputs.non-rust == 'true'
280275

281276
steps:
282-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
277+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
283278
with:
284279
persist-credentials: false
285280

@@ -313,7 +308,7 @@ jobs:
313308
PERCY_PARALLEL_TOTAL: 2
314309

315310
steps:
316-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
311+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
317312
with:
318313
persist-credentials: false
319314

@@ -348,16 +343,16 @@ jobs:
348343
permissions:
349344
security-events: write
350345
steps:
351-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
346+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
352347
with:
353348
persist-credentials: false
354349

355-
- uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
350+
- uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
356351
- run: uvx zizmor@${ZIZMOR_VERSION} --format=sarif . > results.sarif
357352
env:
358353
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
359354

360-
- uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.7
355+
- uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
361356
with:
362357
sarif_file: results.sarif
363358
category: zizmor

.github/workflows/smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-24.04
1818

1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121
with:
2222
persist-credentials: false
2323

0 commit comments

Comments
 (0)