Skip to content

Commit 13c8cf3

Browse files
authored
Merge branch 'main' into feat/secrets_outside_env
2 parents 6b963b6 + 1b8b5d2 commit 13c8cf3

File tree

121 files changed

+3659
-904
lines changed

Some content is hidden

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

121 files changed

+3659
-904
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
3535

36-
- uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
36+
- uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
3737

3838
- name: Test dependencies
3939
run: |
@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
persist-credentials: false
5959

60-
- uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
60+
- uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
6161

6262
- name: Test site
6363
run: make site

.github/workflows/pypi.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
persist-credentials: false
4242
- name: Build wheels
43-
uses: PyO3/maturin-action@22fe573c6ed0c03ab9b84e631cbfa49bddf6e20e # v1
43+
uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1
4444
with:
4545
target: ${{ matrix.platform.target }}
4646
args: --release --out dist
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
persist-credentials: false
7171
- name: Build wheels
72-
uses: PyO3/maturin-action@22fe573c6ed0c03ab9b84e631cbfa49bddf6e20e # v1
72+
uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1
7373
with:
7474
target: ${{ matrix.platform.target }}
7575
args: --release --out dist
@@ -94,7 +94,7 @@ jobs:
9494
with:
9595
persist-credentials: false
9696
- name: Build wheels
97-
uses: PyO3/maturin-action@22fe573c6ed0c03ab9b84e631cbfa49bddf6e20e # v1
97+
uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1
9898
with:
9999
target: ${{ matrix.platform.target }}
100100
args: --release --out dist
@@ -109,18 +109,16 @@ jobs:
109109
strategy:
110110
matrix:
111111
platform:
112-
# TODO: Bump to macos-15 once Rust 1.85+ is available.
113-
# See: https://github.com/actions/runner-images/issues/11637
114-
- runner: macos-14
112+
- runner: macos-15
115113
target: x86_64
116-
- runner: macos-14
114+
- runner: macos-15
117115
target: aarch64
118116
steps:
119117
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
120118
with:
121119
persist-credentials: false
122120
- name: Build wheels
123-
uses: PyO3/maturin-action@22fe573c6ed0c03ab9b84e631cbfa49bddf6e20e # v1
121+
uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1
124122
with:
125123
target: ${{ matrix.platform.target }}
126124
args: --release --out dist
@@ -137,7 +135,7 @@ jobs:
137135
with:
138136
persist-credentials: false
139137
- name: Build sdist
140-
uses: PyO3/maturin-action@22fe573c6ed0c03ab9b84e631cbfa49bddf6e20e # v1
138+
uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1
141139
with:
142140
command: sdist
143141
args: --out dist
@@ -170,7 +168,7 @@ jobs:
170168
subject-path: 'wheels-*/*'
171169
- name: Publish to PyPI
172170
if: ${{ startsWith(github.ref, 'refs/tags/') }}
173-
uses: PyO3/maturin-action@22fe573c6ed0c03ab9b84e631cbfa49bddf6e20e # v1
171+
uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1
174172
with:
175173
command: upload
176174
args: --non-interactive --skip-existing wheels-*/*

.github/workflows/site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
persist-credentials: false
3131

3232
- name: Install the latest version of uv
33-
uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
33+
uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
3434

3535
- name: build site
3636
run: make site

.github/workflows/test-sarif.yml renamed to .github/workflows/test-output.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test SARIF Presentation
1+
name: Test output formats
22

33
on:
44
pull_request:
@@ -29,7 +29,7 @@ jobs:
2929
cargo run -- --format sarif . > results.sarif
3030
3131
- name: Upload SARIF file
32-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
32+
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
3333
with:
3434
sarif_file: results.sarif
3535
category: zizmor-test-sarif-presentation
@@ -46,3 +46,26 @@ jobs:
4646
repo: context.repo.repo,
4747
body: `:robot: Presentation results: <${url}>`
4848
})
49+
50+
test-github-presentation:
51+
runs-on: ubuntu-latest
52+
if: contains(github.event.pull_request.labels.*.name, 'test-github-presentation')
53+
permissions: {}
54+
55+
steps:
56+
- name: Checkout repository
57+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
58+
with:
59+
persist-credentials: false
60+
61+
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
62+
63+
- name: Run zizmor
64+
run: |
65+
# Normally we'd want a workflow to fail if the audit fails,
66+
# but we're only testing presentation here.
67+
cargo run \
68+
-- \
69+
--no-exit-codes \
70+
--format github \
71+
tests/integration/test-data/several-vulnerabilities.yml

.github/workflows/zizmor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
with:
2222
persist-credentials: false
2323
- name: Install the latest version of uv
24-
uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
24+
uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
2525
- name: Run zizmor 🌈
2626
run: uvx zizmor --format sarif . > results.sarif
2727
env:
2828
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929
- name: Upload SARIF file
30-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
30+
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
3131
with:
3232
sarif_file: results.sarif
3333
category: zizmor

0 commit comments

Comments
 (0)