Skip to content

Commit fda5b92

Browse files
authored
Merge branch 'main' into iainlane/many-events
2 parents 073ab72 + 3481dbb commit fda5b92

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

+2239
-1700
lines changed

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ updates:
1515
directory: "/"
1616
schedule:
1717
interval: "weekly"
18+
cooldown:
19+
default-days: 5
1820
groups:
1921
github:
2022
patterns:
@@ -25,6 +27,8 @@ updates:
2527
directory: "/lambdas"
2628
schedule:
2729
interval: "weekly"
30+
cooldown:
31+
default-days: 5
2832
groups:
2933
aws:
3034
patterns:
@@ -51,31 +55,49 @@ updates:
5155
commit-message:
5256
prefix: "fix(lambda)"
5357
prefix-development: "chore(lambda)"
58+
# Ignore major version updates for Node.js related packages to keep aligned with Lambda runtime as configured via Terraform
59+
ignore:
60+
- dependency-name: "@types/node"
61+
update-types: ["version-update:semver-major"]
5462

5563
- package-ecosystem: "docker"
5664
directory: "/.ci/Dockerfile"
5765
schedule:
5866
interval: "weekly"
67+
cooldown:
68+
default-days: 5
5969
labels:
6070
- "dependencies"
6171
- "docker"
6272
commit-message:
6373
prefix: "chore(docker)"
74+
# Ignore major version updates for Node.js Docker images to keep aligned with Lambda runtime as configured via Terraform
75+
ignore:
76+
- dependency-name: "node"
77+
update-types: ["version-update:semver-major"]
6478

6579
- package-ecosystem: "docker"
6680
directory: "/.devcontainer/Dockerfile"
6781
schedule:
6882
interval: "weekly"
83+
cooldown:
84+
default-days: 5
6985
labels:
7086
- "dependencies"
7187
- "docker"
7288
commit-message:
7389
prefix: "chore(devcontainer)"
90+
# Ignore major version updates for Node.js Docker images to keep aligned with Lambda runtime as configured via Terraform
91+
ignore:
92+
- dependency-name: "mcr.microsoft.com/vscode/devcontainers/typescript-node"
93+
update-types: ["version-update:semver-major"]
7494

7595
- package-ecosystem: "pip"
7696
directory: "/.github/workflows/mkdocs"
7797
schedule:
7898
interval: "weekly"
99+
cooldown:
100+
default-days: 5
79101
groups:
80102
python-deps:
81103
patterns:

.github/workflows/codeql.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
schedule:
1111
- cron: '25 19 * * 2'
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1317
permissions:
1418
contents: read
1519

@@ -27,7 +31,7 @@ jobs:
2731

2832
steps:
2933
- name: Harden the runner (Audit all outbound calls)
30-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
34+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
3135
with:
3236
egress-policy: audit
3337

@@ -38,12 +42,12 @@ jobs:
3842

3943
# Initializes the CodeQL tools for scanning.
4044
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
45+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
4246
with:
4347
languages: ${{ matrix.language }}
4448
build-mode: none
4549

4650
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
51+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
4852
with:
4953
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
name: 'Dependency Review'
1010
on: [pull_request]
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
1216
permissions: {}
1317

1418
jobs:
@@ -20,7 +24,7 @@ jobs:
2024
pull-requests: write # for actions/dependency-review-action to comment on PRs
2125
steps:
2226
- name: Harden the runner (Audit all outbound calls)
23-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
27+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
2428
with:
2529
egress-policy: audit
2630

@@ -29,6 +33,6 @@ jobs:
2933
with:
3034
persist-credentials: false
3135
- name: 'Dependency Review'
32-
uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
36+
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
3337
with:
3438
comment-summary-in-pr: always

.github/workflows/lambda.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
- 'lambdas/**'
99
- '.github/workflows/lambda.yml'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
permissions:
1216
contents: read
1317

@@ -23,7 +27,7 @@ jobs:
2327

2428
steps:
2529
- name: Harden the runner (Audit all outbound calls)
26-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
30+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
2731
with:
2832
egress-policy: audit
2933

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mkdocs-material==9.6.22
1+
mkdocs-material==9.7.0

.github/workflows/mkdocs/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ mkdocs-get-deps==0.2.0 \
223223
--hash=sha256:162b3d129c7fad9b19abfdcb9c1458a651628e4b1dea628ac68790fb3061c60c \
224224
--hash=sha256:2bf11d0b133e77a0dd036abeeb06dec8775e46efa526dc70667d8863eefc6134
225225
# via mkdocs
226-
mkdocs-material==9.6.22 \
227-
--hash=sha256:14ac5f72d38898b2f98ac75a5531aaca9366eaa427b0f49fc2ecf04d99b7ad84 \
228-
--hash=sha256:87c158b0642e1ada6da0cbd798a3389b0bc5516b90e5ece4a0fb939f00bacd1c
226+
mkdocs-material==9.7.0 \
227+
--hash=sha256:602b359844e906ee402b7ed9640340cf8a474420d02d8891451733b6b02314ec \
228+
--hash=sha256:da2866ea53601125ff5baa8aa06404c6e07af3c5ce3d5de95e3b52b80b442887
229229
# via -r requirements.in
230230
mkdocs-material-extensions==1.3.1 \
231231
--hash=sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443 \

.github/workflows/ossf-scorecard.yml

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

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
permissions:
1115
contents: read # for actions/checkout and repository analysis
1216

@@ -21,7 +25,7 @@ jobs:
2125

2226
steps:
2327
- name: Harden the runner (Audit all outbound calls)
24-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
28+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
2529
with:
2630
egress-policy: audit
2731

@@ -49,6 +53,6 @@ jobs:
4953
# Upload the results to GitHub's code scanning dashboard (optional).
5054
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5155
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
56+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
5357
with:
5458
sarif_file: results.sarif

.github/workflows/ovs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
merge_group:
66
branches: [main]
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
permissions: {}
913

1014
jobs:
@@ -13,4 +17,4 @@ jobs:
1317
actions: read # Required to upload SARIF file to CodeQL
1418
security-events: write # Require writing security events to upload
1519
contents: read # for checkout
16-
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@e92b5d07338d4f0ba0981dffed17c48976ca4730" # v2.2.3
20+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@9bb69575e74019c2ad085a1860787043adf47ccb" # v2.2.4

.github/workflows/packer-build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ on:
88
- "images/**"
99
- ".github/workflows/packer-build.yml"
1010
- "module/runners/templates/**"
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
1116
permissions:
1217
contents: read
1318

@@ -29,7 +34,7 @@ jobs:
2934
working-directory: images/${{ matrix.image }}
3035
steps:
3136
- name: Harden the runner (Audit all outbound calls)
32-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
37+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
3338
with:
3439
egress-policy: audit
3540

.github/workflows/release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- v1
77
workflow_dispatch:
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: false
12+
913
permissions:
1014
contents: read
1115

@@ -20,7 +24,7 @@ jobs:
2024
attestations: write # for actions/attest-build-provenance to write attestations
2125
steps:
2226
- name: Harden the runner (Audit all outbound calls)
23-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
27+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
2428
with:
2529
egress-policy: audit
2630

0 commit comments

Comments
 (0)