Skip to content

Commit ab4d1f0

Browse files
mathbunnyrumathbunnyru
authored
Update cmake to 4.2.1, conan to 2.24.0 (#92)
1 parent cc09fd3 commit ab4d1f0

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎.github/workflows/debian.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ env:
3030
FALLBACK_GCC: 12
3131
FALLBACK_CLANG: 16
3232
CCACHE_VERSION: 4.12.2
33-
CMAKE_VERSION: 4.1.0
34-
CONAN_VERSION: 2.22.2
33+
CMAKE_VERSION: 4.2.1
34+
CONAN_VERSION: 2.24.0
3535
GCOVR_VERSION: 8.3
3636
MOLD_VERSION: 2.40.4
3737
RUST_VERSION: 1.91.1

‎.github/workflows/rhel.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ env:
2828
CONTAINER_REGISTRY: ghcr.io
2929
BUILDKIT_PROGRESS: plain
3030
CCACHE_VERSION: 4.12.2
31-
CMAKE_VERSION: 4.1.0
32-
CONAN_VERSION: 2.22.2
31+
CMAKE_VERSION: 4.2.1
32+
CONAN_VERSION: 2.24.0
3333
GCOVR_VERSION: 8.3
3434
MOLD_VERSION: 2.40.4
3535
RUST_VERSION: 1.91.1

‎.github/workflows/tools-rippled.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
PUSH: ${{ github.event_name == 'push' }}
2626
CONTAINER_REGISTRY: ghcr.io
2727
BUILDKIT_PROGRESS: plain
28-
CMAKE_VERSION: 4.1.0
28+
CMAKE_VERSION: 4.2.1
2929
DOXYGEN_VERSION: 1.9.8+ds-2build5
3030
GCC_VERSION: 14
3131
GRAPHVIZ_VERSION: 2.42.2-9ubuntu0.1

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ env:
3030
FALLBACK_GCC: 12
3131
FALLBACK_CLANG: 16
3232
CCACHE_VERSION: 4.12.2
33-
CMAKE_VERSION: 4.1.0
34-
CONAN_VERSION: 2.22.2
33+
CMAKE_VERSION: 4.2.1
34+
CONAN_VERSION: 2.24.0
3535
GCOVR_VERSION: 8.3
3636
MOLD_VERSION: 2.40.4
3737
RUST_VERSION: 1.91.1

‎docker/debian/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ directory of the repository.
3939
DEBIAN_VERSION=bookworm
4040
GCC_VERSION=12
4141
CCACHE_VERSION=4.12.2
42-
CMAKE_VERSION=4.1.0
43-
CONAN_VERSION=2.22.2
42+
CMAKE_VERSION=4.2.1
43+
CONAN_VERSION=2.24.0
4444
GCOVR_VERSION=8.3
4545
MOLD_VERSION=2.40.4
4646
RUST_VERSION=1.91.1
@@ -73,8 +73,8 @@ GCC_VERSION=12
7373
BASE_IMAGE=ghcr.io/xrplf/ci/gcc:${GCC_VERSION}-bullseye
7474
# The versions of the tools to use.
7575
CCACHE_VERSION=4.12.2
76-
CMAKE_VERSION=4.1.0
77-
CONAN_VERSION=2.22.2
76+
CMAKE_VERSION=4.2.1
77+
CONAN_VERSION=2.24.0
7878
GCOVR_VERSION=8.3
7979
MOLD_VERSION=2.40.4
8080
RUST_VERSION=1.91.1
@@ -109,8 +109,8 @@ DEBIAN_VERSION=bookworm
109109
CLANG_VERSION=17
110110
# The versions of the tools to use.
111111
CCACHE_VERSION=4.12.2
112-
CMAKE_VERSION=4.1.0
113-
CONAN_VERSION=2.22.2
112+
CMAKE_VERSION=4.2.1
113+
CONAN_VERSION=2.24.0
114114
GCOVR_VERSION=8.3
115115
MOLD_VERSION=2.40.4
116116
RUST_VERSION=1.91.1

‎docker/rhel/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ RHEL_VERSION=9
2929
GCC_VERSION=12
3030
# The versions of the tools to use.
3131
CCACHE_VERSION=4.12.2
32-
CMAKE_VERSION=4.1.0
33-
CONAN_VERSION=2.22.2
32+
CMAKE_VERSION=4.2.1
33+
CONAN_VERSION=2.24.0
3434
GCOVR_VERSION=8.3
3535
MOLD_VERSION=2.40.4
3636
RUST_VERSION=1.91.1
@@ -62,8 +62,8 @@ directory of the repository.
6262
RHEL_VERSION=10
6363
# The versions of the tools to use.
6464
CCACHE_VERSION=4.12.2
65-
CMAKE_VERSION=4.1.0
66-
CONAN_VERSION=2.22.2
65+
CMAKE_VERSION=4.2.1
66+
CONAN_VERSION=2.24.0
6767
GCOVR_VERSION=8.3
6868
MOLD_VERSION=2.40.4
6969
RUST_VERSION=1.91.1

‎docker/tools-rippled/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ the repository.
5050

5151
```shell
5252
UBUNTU_VERSION=noble
53-
CMAKE_VERSION=4.1.0
53+
CMAKE_VERSION=4.2.1
5454
DOXYGEN_VERSION=1.9.8+ds-2build5
5555
GCC_VERSION=14
5656
GRAPHVIZ_VERSION=2.42.2-9ubuntu0.1

‎docker/ubuntu/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ UBUNTU_VERSION=noble
2828
GCC_VERSION=14
2929
# The versions of the tools to use.
3030
CCACHE_VERSION=4.12.2
31-
CMAKE_VERSION=4.1.0
32-
CONAN_VERSION=2.22.2
31+
CMAKE_VERSION=4.2.1
32+
CONAN_VERSION=2.24.0
3333
GCOVR_VERSION=8.3
3434
MOLD_VERSION=2.40.4
3535
RUST_VERSION=1.91.1
@@ -64,8 +64,8 @@ UBUNTU_VERSION=noble
6464
CLANG_VERSION=18
6565
# The versions of the tools to use.
6666
CCACHE_VERSION=4.12.2
67-
CMAKE_VERSION=4.1.0
68-
CONAN_VERSION=2.22.2
67+
CMAKE_VERSION=4.2.1
68+
CONAN_VERSION=2.24.0
6969
GCOVR_VERSION=8.3
7070
MOLD_VERSION=2.40.4
7171
RUST_VERSION=1.91.1

0 commit comments

Comments
 (0)