Skip to content

Commit 794501a

Browse files
authored
Merge branch 'main' into feature/amp-devcontainer-cpp/update-vscode-extensions-devcontainer.json
2 parents 1250ac4 + 37e7c95 commit 794501a

24 files changed

+33
-33
lines changed

.devcontainer/cpp/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cmake==4.1.2
2-
conan==2.22.1
2+
conan==2.22.2
33
gcovr==8.4

.devcontainer/cpp/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ colorlog==6.8.2 \
144144
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
145145
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
146146
# via gcovr
147-
conan==2.22.1 \
148-
--hash=sha256:c33f4d538f0827e7664813a5e2b5db5ce6a7aa58fb3d0eb6145b2261b56b005c
147+
conan==2.22.2 \
148+
--hash=sha256:8df71de27eca903a1a92b292ce32e4b79eee2407ac001e28cae1d1b49869f883
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \

.devcontainer/rust/devcontainer-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"extensions": [
88
"mhutchie.git-graph@1.30.0",
99
"ms-vsliveshare.vsliveshare@1.0.5959",
10-
"rust-lang.rust-analyzer@0.3.2667",
10+
"rust-lang.rust-analyzer@0.3.2675",
1111
"tamasfe.even-better-toml@0.21.2",
1212
"usernamehw.errorlens@3.26.0"
1313
]

.devcontainer/rust/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"extensions": [
1717
"github.copilot@1.388.0",
1818
"github.vscode-github-actions@0.28.0",
19-
"github.vscode-pull-request-github@0.120.2",
19+
"github.vscode-pull-request-github@0.122.0",
2020
"jetmartin.bats@0.1.10",
2121
"kherring.bats-test-runner@0.1.3",
2222
"mhutchie.git-graph@1.30.0",
2323
"ms-azuretools.vscode-docker@2.0.0",
24-
"rust-lang.rust-analyzer@0.3.2667",
25-
"sonarsource.sonarlint-vscode@4.34.0",
24+
"rust-lang.rust-analyzer@0.3.2675",
25+
"sonarsource.sonarlint-vscode@4.35.1",
2626
"tamasfe.even-better-toml@0.21.2",
2727
"usernamehw.errorlens@3.26.0"
2828
]

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
needs: build-push-test
5757
if: ${{ !cancelled() }}
5858
steps:
59-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
59+
- uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
6060
with:
6161
disable-sudo: true
6262
egress-policy: audit

.github/workflows/image-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
permissions:
1616
packages: write # is needed by dataaxiom/ghcr-cleanup-action to delete untagged and orphaned images
1717
steps:
18-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
18+
- uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
1919
with:
2020
disable-sudo: true
2121
allowed-endpoints: >

.github/workflows/issue-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
issues: write # is needed by actions/stale to close/comment on issues
1616
pull-requests: write # is needed by actions/stale to close/comment on PRs
1717
steps:
18-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
18+
- uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
1919
with:
2020
disable-sudo-and-containers: true
2121
egress-policy: audit

.github/workflows/issue-creation-tool-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
permissions:
1616
issues: write # is needed by gh cli to create/close/pin/unpin issues
1717
steps:
18-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
18+
- uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
1919
with:
2020
disable-sudo-and-containers: true
2121
egress-policy: audit

.github/workflows/linting-formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pull-requests: write # is needed by oxsecurity/megalinter and reviewdog/action-suggester to post PR comments
2727
security-events: write # is needed by oxsecurity/megalinter for uploading sarif files
2828
steps:
29-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
29+
- uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
3030
with:
3131
disable-sudo: true
3232
egress-policy: audit

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
security-events: write # is needed by github/codeql-action/upload-sarif to upload sarif files
2121
id-token: write # is needed by ossf/scorecard-action to authenticate with OIDC
2222
steps:
23-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
23+
- uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
2424
with:
2525
disable-sudo: true
2626
egress-policy: audit

0 commit comments

Comments
 (0)