diff options
author | Brad King <brad.king@kitware.com> | 2023-11-16 14:31:09 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-11-17 14:58:22 (GMT) |
commit | 57eadec6170e19e94b7b56f48a16eb82c4d9dcac (patch) | |
tree | f2eaa25ad130032487179b9e8dba915382cad404 /.gitlab | |
parent | 653262162c8eb250106d062d99e040c4bea1b5a8 (diff) | |
download | CMake-57eadec6170e19e94b7b56f48a16eb82c4d9dcac.zip CMake-57eadec6170e19e94b7b56f48a16eb82c4d9dcac.tar.gz CMake-57eadec6170e19e94b7b56f48a16eb82c4d9dcac.tar.bz2 |
ci: update Linux image to Fedora 39
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/docker/fedora39/Dockerfile (renamed from .gitlab/ci/docker/fedora38/Dockerfile) | 2 | ||||
-rw-r--r-- | .gitlab/ci/docker/fedora39/deps_packages.lst (renamed from .gitlab/ci/docker/fedora38/deps_packages.lst) | 2 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora39/install_deps.sh (renamed from .gitlab/ci/docker/fedora38/install_deps.sh) | 4 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora39/install_iwyu.sh (renamed from .gitlab/ci/docker/fedora38/install_iwyu.sh) | 0 | ||||
-rwxr-xr-x | .gitlab/ci/docker/fedora39/install_rvm.sh (renamed from .gitlab/ci/docker/fedora38/install_rvm.sh) | 0 | ||||
-rw-r--r-- | .gitlab/ci/docker/fedora39/iwyu_packages.lst (renamed from .gitlab/ci/docker/fedora38/iwyu_packages.lst) | 0 | ||||
-rw-r--r-- | .gitlab/ci/docker/fedora39/rvm_packages.lst (renamed from .gitlab/ci/docker/fedora38/rvm_packages.lst) | 0 |
7 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/fedora38/Dockerfile b/.gitlab/ci/docker/fedora39/Dockerfile index 4918693..f14e017 100644 --- a/.gitlab/ci/docker/fedora38/Dockerfile +++ b/.gitlab/ci/docker/fedora39/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG BASE_IMAGE=fedora:38 +ARG BASE_IMAGE=fedora:39 FROM ${BASE_IMAGE} AS dnf-cache # Populate DNF cache w/ the fresh metadata and prefetch packages. diff --git a/.gitlab/ci/docker/fedora38/deps_packages.lst b/.gitlab/ci/docker/fedora39/deps_packages.lst index da050d9..7656cbc 100644 --- a/.gitlab/ci/docker/fedora38/deps_packages.lst +++ b/.gitlab/ci/docker/fedora39/deps_packages.lst @@ -6,6 +6,7 @@ qt6-qtbase-devel # Install development tools. clang +clang-devel clang-tools-extra clang-tools-extra-devel compiler-rt @@ -13,6 +14,7 @@ flang flang-devel gcc-c++ git-core +llvm-devel make # Install optional external build dependencies. diff --git a/.gitlab/ci/docker/fedora38/install_deps.sh b/.gitlab/ci/docker/fedora39/install_deps.sh index cd2701e..70e2293 100755 --- a/.gitlab/ci/docker/fedora38/install_deps.sh +++ b/.gitlab/ci/docker/fedora39/install_deps.sh @@ -19,12 +19,12 @@ for p in Demo test; do done # Remove tests for numpy -for v in 2.7 3.11; do +for v in 2.7 3.12; do find /usr/lib64/python${v}/site-packages/numpy -type d -a -name tests -exec rm -rf {} + done # Remove some other packages tests -find /usr/lib64/python3.11/site-packages/breezy -type d -a -name tests -exec rm -rf {} + +find /usr/lib64/python3.12/site-packages/breezy -type d -a -name tests -exec rm -rf {} + # Perforce curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \ diff --git a/.gitlab/ci/docker/fedora38/install_iwyu.sh b/.gitlab/ci/docker/fedora39/install_iwyu.sh index 684e355..684e355 100755 --- a/.gitlab/ci/docker/fedora38/install_iwyu.sh +++ b/.gitlab/ci/docker/fedora39/install_iwyu.sh diff --git a/.gitlab/ci/docker/fedora38/install_rvm.sh b/.gitlab/ci/docker/fedora39/install_rvm.sh index 10e7545..10e7545 100755 --- a/.gitlab/ci/docker/fedora38/install_rvm.sh +++ b/.gitlab/ci/docker/fedora39/install_rvm.sh diff --git a/.gitlab/ci/docker/fedora38/iwyu_packages.lst b/.gitlab/ci/docker/fedora39/iwyu_packages.lst index e3551bd..e3551bd 100644 --- a/.gitlab/ci/docker/fedora38/iwyu_packages.lst +++ b/.gitlab/ci/docker/fedora39/iwyu_packages.lst diff --git a/.gitlab/ci/docker/fedora38/rvm_packages.lst b/.gitlab/ci/docker/fedora39/rvm_packages.lst index 1dc852e..1dc852e 100644 --- a/.gitlab/ci/docker/fedora38/rvm_packages.lst +++ b/.gitlab/ci/docker/fedora39/rvm_packages.lst |