Skip to content

Commit a6c460e

Browse files
authored
Merge branch 'main' into feature/amp-devcontainer-rust/update-vscode-extensions-devcontainer.json
2 parents 8dbf2de + 37aff31 commit a6c460e

File tree

8 files changed

+41
-35
lines changed

8 files changed

+41
-35
lines changed

.devcontainer/cpp/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
4141
4242
43-
"ms-vscode.cpptools@1.28.3",
43+
"ms-vscode.cpptools@1.29.2",
4444
4545
4646
]

.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.2.0
2-
conan==2.22.2
2+
conan==2.23.0
33
gcovr==8.4

.devcontainer/cpp/requirements.txt

Lines changed: 5 additions & 5 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.2 \
148-
--hash=sha256:8df71de27eca903a1a92b292ce32e4b79eee2407ac001e28cae1d1b49869f883
147+
conan==2.23.0 \
148+
--hash=sha256:1a7b34be6fcaa4a4c0342c54187fb87aa4b487a9b4cf2136f2207f8b3a127868
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \
@@ -399,9 +399,9 @@ six==1.16.0 \
399399
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
400400
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
401401
# via python-dateutil
402-
urllib3==2.5.0 \
403-
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
404-
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
402+
urllib3==2.6.0 \
403+
--hash=sha256:c90f7a39f716c572c4e3e58509581ebd83f9b59cced005b7db7ad2d22b0db99f \
404+
--hash=sha256:cb9bcef5a4b345d5da5d145dc3e30834f58e8018828cbc724d30b4cb7d4d49f1
405405
# via
406406
# conan
407407
# requests

.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
99
10-
10+
1111
1212
1313
]

.github/workflows/linting-formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
persona: pedantic
4040
# flavors/dotnet is the smallest flavor of MegaLinter that contains the linters
4141
# we are interested in.
42-
- uses: oxsecurity/megalinter/flavors/dotnet@62c799d895af9bcbca5eacfebca29d527f125a57 # v9.1.0
42+
- uses: oxsecurity/megalinter/flavors/dotnet@55a59b24a441e0e1943080d4a512d827710d4a9d # v9.2.0
4343
env:
4444
APPLY_FIXES: all
4545
VALIDATE_ALL_CODEBASE: true

.github/workflows/wc-build-push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
registry: ${{ inputs.registry }}
8383
username: ${{ secrets.DOCKER_REGISTRY_USERNAME || github.actor }}
8484
password: ${{ secrets.DOCKER_REGISTRY_PASSWORD || github.token }}
85-
- uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
85+
- uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
8686
env:
8787
DOCKER_METADATA_SET_OUTPUT_ENV: false
8888
id: metadata
@@ -168,7 +168,7 @@ jobs:
168168
registry: ${{ inputs.registry }}
169169
username: ${{ secrets.DOCKER_REGISTRY_USERNAME || github.actor }}
170170
password: ${{ secrets.DOCKER_REGISTRY_PASSWORD || github.token }}
171-
- uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
171+
- uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
172172
id: metadata
173173
env:
174174
DOCKER_METADATA_ANNOTATIONS_LEVELS: index
@@ -226,7 +226,7 @@ jobs:
226226
name: container-diff-${{ needs.sanitize-image-name.outputs.image-basename }}
227227
path: container-diff.json
228228
retention-days: 10
229-
- uses: philips-software/amp-devcontainer/.github/actions/container-size-diff@2a3ac81de046cc18b0895acbd42afcf911ddee44 # v6.5.3
229+
- uses: philips-software/amp-devcontainer/.github/actions/container-size-diff@0d202a6464e5071f396b8c0b95d49542cb2405fa # v6.6.1
230230
id: container-size-diff
231231
with:
232232
from-container: ${{ needs.sanitize-image-name.outputs.fully-qualified-image-name }}:edge

package-lock.json

Lines changed: 27 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"name": "amp-devcontainer-tests",
33
"version": "1.0.0",
44
"devDependencies": {
5-
"@playwright/test": "^1.56.1",
5+
"@playwright/test": "^1.57.0",
66
"@types/node": "^24.10.1",
77
"dotenv": "^17.2.3",
88
"nodemon": "^3.1.11",
99
"otpauth": "^9.4.1",
10-
"playwright-bdd": "^8.4.1"
10+
"playwright-bdd": "^8.4.2"
1111
},
1212
"scripts": {
1313
"test": "cd $INIT_CWD && npx bddgen && npx playwright test",

0 commit comments

Comments
 (0)