Skip to content

Commit 76e6cc6

Browse files
chore(deps): bump conan from 2.11.0 to 2.12.1 in amp-devcontainer-cpp (#710)
* chore(deps): bump conan from 2.11.0 to 2.12.1 in /.devcontainer Bumps [conan](https://github.com/conan-io/conan) from 2.11.0 to 2.12.1. - [Release notes](https://github.com/conan-io/conan/releases) - [Commits](conan-io/conan@2.11.0...2.12.1) --- updated-dependencies: - dependency-name: conan dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: switch back to ubuntu 22.04 for build-push --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ron <[email protected]>
1 parent cbeaaae commit 76e6cc6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
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==3.31.4
2-
conan==2.11.0
2+
conan==2.12.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.11.0 \
148-
--hash=sha256:87f78a295716d1a37dfabc26f5d1b6a0ed49594618ea339420bb89627ececeda
147+
conan==2.12.1 \
148+
--hash=sha256:98c2daba94065e9171417e13c2983233092ab1f400bf5afa8a7616f80b801a7b
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \

.github/workflows/build-push.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ env:
2020

2121
jobs:
2222
build-push:
23-
runs-on: ubuntu-latest
23+
# The ARM64 build segfaults with Ubuntu 24.04, so use 22.04 (for now)
24+
runs-on: ubuntu-22.04
2425
permissions:
2526
attestations: write
2627
# dependency-submission needs contents write permission.

0 commit comments

Comments
 (0)