From b69c63d3aa07f2e653091602b08140f782d01084 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 22 May 2023 09:46:17 -0400 Subject: ci: update Linux image to Fedora 38 --- .gitlab/ci/docker/fedora37/Dockerfile | 58 -------------- .gitlab/ci/docker/fedora37/deps_packages.lst | 115 --------------------------- .gitlab/ci/docker/fedora37/install_deps.sh | 31 -------- .gitlab/ci/docker/fedora37/install_iwyu.sh | 42 ---------- .gitlab/ci/docker/fedora37/install_rvm.sh | 25 ------ .gitlab/ci/docker/fedora37/iwyu_packages.lst | 7 -- .gitlab/ci/docker/fedora37/rvm_packages.lst | 18 ----- .gitlab/ci/docker/fedora38/Dockerfile | 58 ++++++++++++++ .gitlab/ci/docker/fedora38/deps_packages.lst | 115 +++++++++++++++++++++++++++ .gitlab/ci/docker/fedora38/install_deps.sh | 31 ++++++++ .gitlab/ci/docker/fedora38/install_iwyu.sh | 42 ++++++++++ .gitlab/ci/docker/fedora38/install_rvm.sh | 25 ++++++ .gitlab/ci/docker/fedora38/iwyu_packages.lst | 7 ++ .gitlab/ci/docker/fedora38/rvm_packages.lst | 18 +++++ 14 files changed, 296 insertions(+), 296 deletions(-) delete mode 100644 .gitlab/ci/docker/fedora37/Dockerfile delete mode 100644 .gitlab/ci/docker/fedora37/deps_packages.lst delete mode 100755 .gitlab/ci/docker/fedora37/install_deps.sh delete mode 100755 .gitlab/ci/docker/fedora37/install_iwyu.sh delete mode 100755 .gitlab/ci/docker/fedora37/install_rvm.sh delete mode 100644 .gitlab/ci/docker/fedora37/iwyu_packages.lst delete mode 100644 .gitlab/ci/docker/fedora37/rvm_packages.lst create mode 100644 .gitlab/ci/docker/fedora38/Dockerfile create mode 100644 .gitlab/ci/docker/fedora38/deps_packages.lst create mode 100755 .gitlab/ci/docker/fedora38/install_deps.sh create mode 100755 .gitlab/ci/docker/fedora38/install_iwyu.sh create mode 100755 .gitlab/ci/docker/fedora38/install_rvm.sh create mode 100644 .gitlab/ci/docker/fedora38/iwyu_packages.lst create mode 100644 .gitlab/ci/docker/fedora38/rvm_packages.lst diff --git a/.gitlab/ci/docker/fedora37/Dockerfile b/.gitlab/ci/docker/fedora37/Dockerfile deleted file mode 100644 index 5439e9d..0000000 --- a/.gitlab/ci/docker/fedora37/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG BASE_IMAGE=fedora:37 - -FROM ${BASE_IMAGE} AS dnf-cache -# Populate DNF cache w/ the fresh metadata and prefetch packages. -RUN --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ - --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - --downloadonly \ - -y \ - $(grep -h '^[^#]\+$' /root/*.lst) - - -FROM ${BASE_IMAGE} AS rvm-build -LABEL maintainer="Ben Boeckel " - -RUN --mount=type=bind,source=install_rvm.sh,target=/root/install_rvm.sh \ - --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_rvm.sh - - -FROM ${BASE_IMAGE} AS iwyu-build -LABEL maintainer="Kyle Edwards " - -RUN --mount=type=bind,source=install_iwyu.sh,target=/root/install_iwyu.sh \ - --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_iwyu.sh - - -FROM ${BASE_IMAGE} -LABEL maintainer="Ben Boeckel " - -RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ - --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/cache/dnf,target=/var/cache/dnf,sharing=private \ - --mount=type=cache,target=/var/cache/pip \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - sh /root/install_deps.sh - -RUN --mount=type=bind,from=rvm-build,source=/root,target=/root \ - tar -C /usr/local -xf /root/rvm.tar - -RUN --mount=type=bind,from=iwyu-build,source=/root,target=/root \ - tar -C / -xf /root/iwyu.tar diff --git a/.gitlab/ci/docker/fedora37/deps_packages.lst b/.gitlab/ci/docker/fedora37/deps_packages.lst deleted file mode 100644 index c7c1385..0000000 --- a/.gitlab/ci/docker/fedora37/deps_packages.lst +++ /dev/null @@ -1,115 +0,0 @@ -# Install build requirements. -ncurses-devel -openssl-devel -qt5-qtbase-devel -qt6-qtbase-devel - -# Install development tools. -clang -clang-tools-extra -clang-tools-extra-devel -compiler-rt -flang -flang-devel -gcc-c++ -git-core -make - -# Install optional external build dependencies. -bzip2-devel -expat-devel -jsoncpp-devel -libarchive-devel -libcurl-devel -libuv-devel -libuv-devel -libzstd-devel -rhash-devel -xz-devel -zlib-devel - -# Install documentation tools. -python3-sphinx -texinfo -qt5-qttools-devel -qt6-qttools-devel - -# Install lint tools. -clang-analyzer -codespell - -# Tools needed for the test suite. -findutils -file -jq -which - -# Packages needed to test CTest. -breezy -subversion -mercurial - -# Packages needed to test CPack. -rpm-build - -# Packages needed to test find modules. -alsa-lib-devel -blas-devel -boost-devel boost-python3-devel -bzip2-devel -cups-devel -DevIL-devel -doxygen -expat-devel -fontconfig-devel -freeglut-devel -freetype-devel -gdal-devel -gettext -giflib-devel -glew-devel -gmock -gnutls-devel -grpc-devel grpc-plugins -gsl-devel -gtest-devel -gtk2-devel -hdf5-devel -hdf5-mpich-devel -hdf5-openmpi-devel -ImageMagick-c++-devel -java-11-openjdk-devel -jsoncpp-devel -lapack-devel -libarchive-devel -libcurl-devel -libicu-devel -libinput-devel systemd-devel -libjpeg-turbo-devel -libpng-devel -opensp-devel -postgresql-server-devel -libtiff-devel -libuv-devel -libxml2-devel -libxslt-devel -mpich-devel -openal-soft-devel -openmpi-devel -patch -perl -protobuf-devel protobuf-c-devel protobuf-lite-devel -pypy2 pypy2-devel -pypy3 pypy3-devel -python2 python2-devel -python3 python3-devel python3-numpy -python3-jsmin python3-jsonschema -ruby rubygems ruby-devel -SDL-devel -sqlite-devel -swig -unixODBC-devel -wxGTK-devel -xalan-c-devel -xerces-c-devel -xz-devel diff --git a/.gitlab/ci/docker/fedora37/install_deps.sh b/.gitlab/ci/docker/fedora37/install_deps.sh deleted file mode 100755 index cd2701e..0000000 --- a/.gitlab/ci/docker/fedora37/install_deps.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -e - -dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - -y \ - $(grep '^[^#]\+$' /root/deps_packages.lst) - -# Fedora no longer packages python2 numpy. -curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o - | python2 -pip2.7 install --disable-pip-version-check --no-input --no-compile --cache-dir /var/cache/pip numpy - -# Remove demos and Python2 tests -for p in Demo test; do - rm -rf /usr/lib64/python2.7/${p} -done - -# Remove tests for numpy -for v in 2.7 3.11; 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 {} + - -# Perforce -curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \ - | tar -C /usr/local/bin -xvzf - -- p4 p4d diff --git a/.gitlab/ci/docker/fedora37/install_iwyu.sh b/.gitlab/ci/docker/fedora37/install_iwyu.sh deleted file mode 100755 index 684e355..0000000 --- a/.gitlab/ci/docker/fedora37/install_iwyu.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -# Install development tools. -dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - -y \ - $(grep '^[^#]\+$' /root/iwyu_packages.lst) - -cd /root -git clone "https://github.com/include-what-you-use/include-what-you-use.git" -cd include-what-you-use -readonly llvm_full_version="$( clang --version | head -n1 | cut -d' ' -f3 )" -readonly llvm_version="$( echo "$llvm_full_version" | cut -d. -f-1 )" -git checkout "clang_$llvm_version" -git apply <