Skip to content

Commit 00a882e

Browse files
committed
Merge origin/main (#230) into the lock-repair branch
Resolves actions.lock: keeps the repaired lock's structure and takes the two facts #230 changed on main: scan-and-report.yml's rust-toolchain pin (683b588c, as main now pins it) and github/codeql-action v4.39.0. The e2a55d2f record no workflow references any more is left for prune-stale; check-lock-sync is in sync. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019a95kk88TZ1iegsBK3kox3
2 parents afed663 + 8c2f198 commit 00a882e

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎.github/workflows/actions.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ workflows:
2525
- 'dtolnay/rust-toolchain@v1'
2626
'.github/workflows/codeql.yml':
2727
- 'actions/checkout@v7.0.1'
28-
- 'github/codeql-action@v4.38.3'
28+
- 'github/codeql-action@v4.39.0'
2929
'.github/workflows/coverage.yml':
3030
- 'actions/checkout@v7.0.1'
3131
- 'dtolnay/rust-toolchain@v1'
@@ -68,7 +68,7 @@ workflows:
6868
'.github/workflows/scan-and-report.yml':
6969
- 'Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6'
7070
- 'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1'
71-
- 'dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f'
71+
- 'dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8'
7272
'.github/workflows/scorecard.yml':
7373
- 'hyperpolymath/standards@333b06a01db1874ffedb2de1bfabb195640927c7'
7474
'.github/workflows/secret-scanner.yml':
@@ -181,9 +181,9 @@ dependencies:
181181
commit: 'sha1-b96794f015dfd88f77b49b1c93e0fa7110f94c63'
182182
owner_id: 9919
183183
repo_id: 259445878
184-
'github/codeql-action@v4.38.3':
185-
ref: 'v4.38.3'
186-
commit: 'sha1-24c54180a607b1449ed407dd24f251e4e9147c8d'
184+
'github/codeql-action@v4.39.0':
185+
ref: 'v4.39.0'
186+
commit: 'sha1-6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee'
187187
owner_id: 9919
188188
repo_id: 259445878
189189
'goto-bus-stop/setup-zig@abea47f85e598557f500fa1fd2ab7464fcb39406':

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
uses: actions/checkout@v7.0.1
4747

4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@v4.38.3
49+
uses: github/codeql-action/init@v4.39.0
5050
with:
5151
languages: ${{ matrix.language }}
5252
build-mode: ${{ matrix.build-mode }}
5353

5454
- name: Perform CodeQL Analysis
55-
uses: github/codeql-action/analyze@v4.38.3
55+
uses: github/codeql-action/analyze@v4.39.0
5656
with:
5757
category: "/language:${{ matrix.language }}"

‎.github/workflows/scan-and-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4040

4141
- name: Install Rust
42-
uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1
42+
uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # v1
4343
with:
4444
toolchain: stable
4545

0 commit comments

Comments
 (0)