Skip to content

Commit 9c95a85

Browse files
committed
Merge branch 'feature/native-arm64-build' of https://github.com/philips-software/amp-devcontainer into feature/native-arm64-build
2 parents 1c9f6ff + fb1667c commit 9c95a85

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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.0.2
2-
conan==2.16.1
2+
conan==2.17.0
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.16.1 \
148-
--hash=sha256:e5b2aac9dab4f23e95f62a7c62dfb33c5f4522fab34332120c8be6eca11f5bec
147+
conan==2.17.0 \
148+
--hash=sha256:91bca3c5b4a9b361d2a9155cf7e678707fccd738cdeb601b5ca398478f99a824
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \

0 commit comments

Comments
 (0)