Skip to content

Commit 2ca8bfe

Browse files
authored
Merge branch 'main' into feature/amp-devcontainer-cpp/update-vscode-extensions
2 parents b93a9f1 + 5680fbe commit 2ca8bfe

23 files changed

+44
-46
lines changed

.devcontainer/cpp/devcontainer-lock.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"features": {
3-
"ghcr.io/devcontainers/features/desktop-lite:1": {
4-
"version": "1.2.6",
5-
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:818bb1cd8c05948e469ef2eb1b7c3f29920624c7fb805015dcc4ba6e8f5d538b",
6-
"integrity": "sha256:818bb1cd8c05948e469ef2eb1b7c3f29920624c7fb805015dcc4ba6e8f5d538b"
3+
"ghcr.io/devcontainers/features/desktop-lite:": {
4+
"version": "1.2.7",
5+
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:8247ef1d9058f79e86bfe17e26c2688ac3acd726ec2966e20f19173838896983",
6+
"integrity": "sha256:8247ef1d9058f79e86bfe17e26c2688ac3acd726ec2966e20f19173838896983"
77
},
88
"ghcr.io/devcontainers/features/github-cli:1": {
99
"version": "1.0.14",

.devcontainer/cpp/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"NODE_EXTRA_CA_CERTS": "/usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt"
1010
},
1111
"features": {
12-
"ghcr.io/devcontainers/features/desktop-lite:1": {},
12+
"ghcr.io/devcontainers/features/desktop-lite:": {},
1313
"ghcr.io/devcontainers/features/github-cli:1": {},
1414
"ghcr.io/devcontainers/features/node:1": {}
1515
},

.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.0.3
2-
conan==2.17.0
2+
conan==2.17.1
33
gcovr==8.3

.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.17.0 \
148-
--hash=sha256:91bca3c5b4a9b361d2a9155cf7e678707fccd738cdeb601b5ca398478f99a824
147+
conan==2.17.1 \
148+
--hash=sha256:7605c8e9990382d37266e69b9f4f671cc23d6478c75b572be53829387f1cf8c8
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \

.github/workflows/issue-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
pull-requests: write
1616
steps:
17-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
17+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1818
with:
1919
disable-sudo-and-containers: true
2020
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
1717
steps:
18-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
18+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1919
with:
2020
disable-sudo-and-containers: true
2121
egress-policy: audit

.github/workflows/linting-formatting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pull-requests: write
2626
security-events: write
2727
steps:
28-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
28+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2929
with:
3030
disable-sudo: true
3131
egress-policy: audit
@@ -41,7 +41,7 @@ jobs:
4141
APPLY_FIXES: all
4242
VALIDATE_ALL_CODEBASE: true
4343
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
- uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
44+
- uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
4545
if: success() || failure()
4646
with:
4747
sarif_file: megalinter-reports/megalinter-report.sarif

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
security-events: write
1919
id-token: write
2020
steps:
21-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
21+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2222
with:
2323
disable-sudo: true
2424
egress-policy: audit
@@ -31,6 +31,6 @@ jobs:
3131
results_format: sarif
3232
repo_token: ${{ secrets.SCORECARD_TOKEN }}
3333
publish_results: true
34-
- uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
34+
- uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
3535
with:
3636
sarif_file: results.sarif

.github/workflows/pr-conventional-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
permissions:
1717
pull-requests: write
1818
steps:
19-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
19+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2020
with:
2121
disable-sudo-and-containers: true
2222
egress-policy: block

.github/workflows/pr-image-cleanup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
permissions:
2020
packages: write
2121
steps:
22-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
22+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2323
with:
2424
disable-sudo: true
2525
egress-policy: audit
@@ -40,7 +40,7 @@ jobs:
4040
# actions: write permission is required to delete the cache
4141
actions: write
4242
steps:
43-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
43+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
4444
with:
4545
disable-sudo-and-containers: true
4646
egress-policy: audit

0 commit comments

Comments
 (0)