Skip to content

Commit d6af260

Browse files
authored
Merge branch 'main' into iainlane/many-events
2 parents c777ace + 75899e5 commit d6af260

File tree

26 files changed

+1748
-2642
lines changed

26 files changed

+1748
-2642
lines changed

.github/workflows/actions.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
name: Analyze (${{ matrix.language }})
1919
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2020
permissions:
21-
# required for all workflows
22-
security-events: write
21+
security-events: write # required for CodeQL to upload security scan results
2322

2423
strategy:
2524
fail-fast: false
@@ -39,12 +38,12 @@ jobs:
3938

4039
# Initializes the CodeQL tools for scanning.
4140
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
41+
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
4342
with:
4443
languages: ${{ matrix.language }}
4544
build-mode: none
4645

4746
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
47+
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
4948
with:
5049
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ permissions: {}
1313

1414
jobs:
1515
dependency-review:
16+
name: Dependency vulnerability scan
1617
runs-on: ubuntu-latest
1718
permissions:
18-
contents: read
19-
pull-requests: write
19+
contents: read # for actions/checkout
20+
pull-requests: write # for actions/dependency-review-action to comment on PRs
2021
steps:
2122
- name: Harden the runner (Audit all outbound calls)
2223
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -28,6 +29,6 @@ jobs:
2829
with:
2930
persist-credentials: false
3031
- name: 'Dependency Review'
31-
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
32+
uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
3233
with:
3334
comment-summary-in-pr: always

.github/workflows/lambda.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ permissions:
1313

1414
jobs:
1515
build:
16+
name: Build and test lambda functions
1617
runs-on: ubuntu-latest
17-
strategy:
18-
matrix:
19-
node: [22]
2018
container:
21-
image: node:${{ matrix.node }}
19+
image: node:22@sha256:2bb201f33898d2c0ce638505b426f4dd038cc00e5b2b4cbba17b069f0fff1496
2220
defaults:
2321
run:
2422
working-directory: ./lambdas
@@ -44,7 +42,7 @@ jobs:
4442
- name: Build distribution
4543
run: yarn build
4644
- name: Upload coverage report
47-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
45+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4846
if: ${{ failure() }}
4947
with:
5048
name: coverage-reports
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mkdocs-material==9.6.20
1+
mkdocs-material==9.6.22

.github/workflows/mkdocs/requirements.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ charset-normalizer==3.4.2 \
118118
click==8.2.1 \
119119
--hash=sha256:27c491cc05d968d271d5a1db13e3b5a184636d9d930f148c50b038f0d0646202 \
120120
--hash=sha256:61a3265b914e850b85317d0b3109c7f8cd35a670f963866005d6ef1d5175a12b
121-
# via
122-
# mkdocs
123-
# mkdocs-material
121+
# via mkdocs
124122
colorama==0.4.6 \
125123
--hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
126124
--hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
@@ -225,9 +223,9 @@ mkdocs-get-deps==0.2.0 \
225223
--hash=sha256:162b3d129c7fad9b19abfdcb9c1458a651628e4b1dea628ac68790fb3061c60c \
226224
--hash=sha256:2bf11d0b133e77a0dd036abeeb06dec8775e46efa526dc70667d8863eefc6134
227225
# via mkdocs
228-
mkdocs-material==9.6.20 \
229-
--hash=sha256:b8d8c8b0444c7c06dd984b55ba456ce731f0035c5a1533cc86793618eb1e6c82 \
230-
--hash=sha256:e1f84d21ec5fb730673c4259b2e0d39f8d32a3fef613e3a8e7094b012d43e790
226+
mkdocs-material==9.6.22 \
227+
--hash=sha256:14ac5f72d38898b2f98ac75a5531aaca9366eaa427b0f49fc2ecf04d99b7ad84 \
228+
--hash=sha256:87c158b0642e1ada6da0cbd798a3389b0bc5516b90e5ece4a0fb939f00bacd1c
231229
# via -r requirements.in
232230
mkdocs-material-extensions==1.3.1 \
233231
--hash=sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443 \

.github/workflows/ossf-scorecard.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ on:
77
push:
88
branches: [ "main" ]
99

10-
permissions: read-all
10+
permissions:
11+
contents: read # for actions/checkout and repository analysis
1112

1213
jobs:
1314
analysis:
1415
name: Scorecard analysis
1516
runs-on: ubuntu-latest
1617
if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
1718
permissions:
18-
security-events: write
19-
id-token: write
19+
security-events: write # for github/codeql-action/upload-sarif to upload security scan results
20+
id-token: write # for ossf/scorecard-action to generate attestations
2021

2122
steps:
2223
- name: Harden the runner (Audit all outbound calls)
@@ -30,7 +31,7 @@ jobs:
3031
persist-credentials: false
3132

3233
- name: "Run analysis"
33-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
34+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3435
with:
3536
results_file: results.sarif
3637
results_format: sarif
@@ -39,7 +40,7 @@ jobs:
3940
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4041
# format to the repository Actions tab.
4142
- name: "Upload artifact"
42-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
43+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4344
with:
4445
name: SARIF file
4546
path: results.sarif
@@ -48,6 +49,6 @@ jobs:
4849
# Upload the results to GitHub's code scanning dashboard (optional).
4950
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5051
- name: "Upload to code-scanning"
51-
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93
52+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
5253
with:
5354
sarif_file: results.sarif

.github/workflows/ovs.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: OSV-Scanner
2+
on:
3+
pull_request:
4+
branches: [main]
5+
merge_group:
6+
branches: [main]
7+
8+
permissions: {}
9+
10+
jobs:
11+
scan-pr:
12+
permissions:
13+
actions: read # Required to upload SARIF file to CodeQL
14+
security-events: write # Require writing security events to upload
15+
contents: read # for checkout
16+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3

.github/workflows/release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ jobs:
1414
name: Release
1515
runs-on: ubuntu-latest
1616
permissions:
17-
contents: write
18-
actions: write
19-
id-token: write
20-
attestations: write
17+
contents: write # for release-please-action to create releases and update changelogs
18+
actions: write # for release-please-action to trigger other workflows
19+
id-token: write # for actions/attest-build-provenance to generate attestations
20+
attestations: write # for actions/attest-build-provenance to write attestations
2121
steps:
2222
- name: Harden the runner (Audit all outbound calls)
2323
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
2424
with:
2525
egress-policy: audit
2626

27-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
27+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2828
with:
2929
node-version: 22
30+
package-manager-cache: false
3031
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3132
with:
3233
persist-credentials: false
@@ -45,7 +46,7 @@ jobs:
4546
run: echo "name=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
4647
- name: Release
4748
id: release
48-
uses: googleapis/release-please-action@c2a5a2bd6a758a0937f1ddb1e8950609867ed15c # v4.3.0
49+
uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4.4.0
4950
with:
5051
target-branch: ${{ steps.branch.outputs.name }}
5152
release-type: terraform-module
@@ -63,14 +64,16 @@ jobs:
6364
VERSION: ${{ github.event.inputs.version }}
6465
TAG_NAME: ${{ steps.release.outputs.tag_name }}
6566
ATTESTATION_URL: ${{ steps.attest.outputs.attestation-url }}
67+
REPOSITORY: ${{ github.repository }}
6668
run: |
6769
version="${VERSION}"
6870
tag_name="${TAG_NAME}"
6971
attestation_url="${ATTESTATION_URL}"
72+
repository="${REPOSITORY}"
7073
gh release view $version --json body -q '.body' > new-release-notes.md
7174
echo "## Attestation" >> new-release-notes.md
7275
echo "Attestation url: $attestation_url" >> new-release-notes.md
73-
echo "Verify the artifacts by running \`gh attestation verify <name_of_artifact> --repo ${{ github.repository }}\`" >> new-release-notes.md
76+
echo "Verify the artifacts by running \`gh attestation verify <name_of_artifact> --repo ${repository}\`" >> new-release-notes.md
7477
gh release edit $tag_name -F new-release-notes.md -t $tag_name
7578
- name: Upload release assets
7679
if: ${{ steps.release.outputs.releases_created == 'true' }}

.github/workflows/semantic-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- edited
77
- synchronize
88
permissions:
9-
contents: read
10-
pull-requests: read
9+
contents: read # for actions/checkout
10+
pull-requests: read # for amannn/action-semantic-pull-request to check PR details
1111
jobs:
1212
main:
1313
name: Semantic Commit Message Check

0 commit comments

Comments
 (0)