summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-05-17 09:50:24 -0400
committerBrad King <brad.king@kitware.com>2023-05-17 09:50:24 -0400
commitf24c6ae5b8dc817a80ce8989991b13ca03641089 (patch)
tree89395979190ac7b3282e76beaf4e562bc3ec2eff
parent30e4be0d1bffab861652769a0a34c9dd975aced7 (diff)
downloadcmake-f24c6ae5b8dc817a80ce8989991b13ca03641089.tar.gz
ci: Add nlohmann-json to Fedora base image
We need version 3.11.2 or higher, which Debian 10 does not package, so leave it out of the Debian base images.
-rw-r--r--.gitlab/ci/docker/fedora37/deps_packages.lst1
-rw-r--r--.gitlab/os-linux.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/docker/fedora37/deps_packages.lst b/.gitlab/ci/docker/fedora37/deps_packages.lst
index c7c13855d4..68777f0494 100644
--- a/.gitlab/ci/docker/fedora37/deps_packages.lst
+++ b/.gitlab/ci/docker/fedora37/deps_packages.lst
@@ -19,6 +19,7 @@ make
bzip2-devel
expat-devel
jsoncpp-devel
+json-devel
libarchive-devel
libcurl-devel
libuv-devel
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 3d62b01ea9..4ac7772178 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -69,7 +69,7 @@
### Fedora
.fedora37:
- image: "kitware/cmake:ci-fedora37-x86_64-2023-03-29"
+ image: "kitware/cmake:ci-fedora37-x86_64-2023-05-17"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"