From 483ff3b9031fcb9651ed7d5bfe35e259d9af0769 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 16 May 2022 20:20:13 -0400 Subject: ci: update Linux image to Fedora 36 --- .gitlab/ci/docker/fedora35/Dockerfile | 18 ----- .gitlab/ci/docker/fedora35/install_deps.sh | 116 ----------------------------- .gitlab/ci/docker/fedora35/install_ispc.sh | 14 ---- .gitlab/ci/docker/fedora35/install_rvm.sh | 19 ----- .gitlab/ci/docker/fedora36/Dockerfile | 18 +++++ .gitlab/ci/docker/fedora36/install_deps.sh | 116 +++++++++++++++++++++++++++++ .gitlab/ci/docker/fedora36/install_ispc.sh | 14 ++++ .gitlab/ci/docker/fedora36/install_rvm.sh | 19 +++++ 8 files changed, 167 insertions(+), 167 deletions(-) delete mode 100644 .gitlab/ci/docker/fedora35/Dockerfile delete mode 100755 .gitlab/ci/docker/fedora35/install_deps.sh delete mode 100755 .gitlab/ci/docker/fedora35/install_ispc.sh delete mode 100755 .gitlab/ci/docker/fedora35/install_rvm.sh create mode 100644 .gitlab/ci/docker/fedora36/Dockerfile create mode 100755 .gitlab/ci/docker/fedora36/install_deps.sh create mode 100755 .gitlab/ci/docker/fedora36/install_ispc.sh create mode 100755 .gitlab/ci/docker/fedora36/install_rvm.sh diff --git a/.gitlab/ci/docker/fedora35/Dockerfile b/.gitlab/ci/docker/fedora35/Dockerfile deleted file mode 100644 index d1614b4..0000000 --- a/.gitlab/ci/docker/fedora35/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM fedora:35 as rvm-build -MAINTAINER Ben Boeckel - -COPY install_rvm.sh /root/install_rvm.sh -RUN sh /root/install_rvm.sh - -FROM fedora:35 -MAINTAINER Ben Boeckel - -COPY install_deps.sh /root/install_deps.sh -RUN sh /root/install_deps.sh - -COPY install_ispc.sh /root/install_ispc.sh -RUN sh /root/install_ispc.sh - -COPY --from=rvm-build /root/rvm.tar /root/rvm.tar -RUN tar -C /usr/local -xf /root/rvm.tar \ - && rm /root/rvm.tar diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh deleted file mode 100755 index 13c70e6..0000000 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -set -e - -# Install build requirements. -dnf install --setopt=install_weak_deps=False -y \ - ncurses-devel \ - openssl-devel \ - qt5-qtbase-devel \ - qt6-qtbase-devel - -# Install development tools. -dnf install --setopt=install_weak_deps=False -y \ - clang-tools-extra \ - compiler-rt \ - gcc-c++ \ - git-core \ - make - -# Install documentation tools. -dnf install --setopt=install_weak_deps=False -y \ - python3-sphinx \ - texinfo \ - qt5-qttools-devel \ - qt6-qttools-devel - -# Install lint tools. -dnf install --setopt=install_weak_deps=False -y \ - clang-analyzer \ - codespell - -# Tools needed for the test suite. -dnf install --setopt=install_weak_deps=False -y \ - findutils \ - file \ - jq \ - which - -# Packages needed to test CTest. -dnf install --setopt=install_weak_deps=False -y \ - breezy \ - subversion \ - mercurial - -# Packages needed to test CPack. -dnf install --setopt=install_weak_deps=False -y \ - rpm-build - -# Packages needed to test find modules. -dnf install --setopt=install_weak_deps=False -y \ - 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 \ - java-11-openjdk-devel \ - jsoncpp-devel \ - lapack-devel \ - libarchive-devel \ - libcurl-devel \ - libicu-devel \ - libinput-devel systemd-devel \ - libjpeg-turbo-devel \ - libpng-devel \ - postgresql-server-devel \ - libtiff-devel \ - libuv-devel \ - libxml2-devel \ - libxslt-devel \ - mpich-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 \ - xalan-c-devel \ - xerces-c-devel \ - xz-devel - -dnf clean all - -# Fedora no longer packages python2 numpy. -curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py -python2 get-pip.py -rm get-pip.py -pip2.7 install numpy - -# Perforce -curl -L -O https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -tar -C /usr/local/bin -xvzf helix-core-server.tgz -- p4 p4d -rm helix-core-server.tgz diff --git a/.gitlab/ci/docker/fedora35/install_ispc.sh b/.gitlab/ci/docker/fedora35/install_ispc.sh deleted file mode 100755 index fdc14b5..0000000 --- a/.gitlab/ci/docker/fedora35/install_ispc.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -readonly version="1.13.0" -readonly sha256sum="8ab1189bd5db596b3eee9d9465d3528b6626a7250675d67102761bb0d284cd21" - -readonly filename="ispc-v$version-linux" -readonly tarball="$filename.tar.gz" - -echo "$sha256sum $tarball" > ispc.sha256sum -curl -OL "https://github.com/ispc/ispc/releases/download/v$version/$tarball" -sha256sum --check ispc.sha256sum -tar --strip-components=1 -C /usr/local -xf "$tarball" "$filename/bin/ispc" diff --git a/.gitlab/ci/docker/fedora35/install_rvm.sh b/.gitlab/ci/docker/fedora35/install_rvm.sh deleted file mode 100755 index 9f595e3..0000000 --- a/.gitlab/ci/docker/fedora35/install_rvm.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -e - -gpg2 --keyserver hkps://keyserver.ubuntu.com \ - --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ - 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - -dnf install --setopt=install_weak_deps=False -y \ - findutils \ - procps \ - which - -curl -sSL https://get.rvm.io | bash -s stable - -# keep version in sync with `env_fedora*_makefiles.cmake` -/usr/local/rvm/bin/rvm install ruby-2.7.0 - -tar -C /usr/local -cf /root/rvm.tar rvm diff --git a/.gitlab/ci/docker/fedora36/Dockerfile b/.gitlab/ci/docker/fedora36/Dockerfile new file mode 100644 index 0000000..cf6ded9 --- /dev/null +++ b/.gitlab/ci/docker/fedora36/Dockerfile @@ -0,0 +1,18 @@ +FROM fedora:36 as rvm-build +MAINTAINER Ben Boeckel + +COPY install_rvm.sh /root/install_rvm.sh +RUN sh /root/install_rvm.sh + +FROM fedora:36 +MAINTAINER Ben Boeckel + +COPY install_deps.sh /root/install_deps.sh +RUN sh /root/install_deps.sh + +COPY install_ispc.sh /root/install_ispc.sh +RUN sh /root/install_ispc.sh + +COPY --from=rvm-build /root/rvm.tar /root/rvm.tar +RUN tar -C /usr/local -xf /root/rvm.tar \ + && rm /root/rvm.tar diff --git a/.gitlab/ci/docker/fedora36/install_deps.sh b/.gitlab/ci/docker/fedora36/install_deps.sh new file mode 100755 index 0000000..13c70e6 --- /dev/null +++ b/.gitlab/ci/docker/fedora36/install_deps.sh @@ -0,0 +1,116 @@ +#!/bin/sh + +set -e + +# Install build requirements. +dnf install --setopt=install_weak_deps=False -y \ + ncurses-devel \ + openssl-devel \ + qt5-qtbase-devel \ + qt6-qtbase-devel + +# Install development tools. +dnf install --setopt=install_weak_deps=False -y \ + clang-tools-extra \ + compiler-rt \ + gcc-c++ \ + git-core \ + make + +# Install documentation tools. +dnf install --setopt=install_weak_deps=False -y \ + python3-sphinx \ + texinfo \ + qt5-qttools-devel \ + qt6-qttools-devel + +# Install lint tools. +dnf install --setopt=install_weak_deps=False -y \ + clang-analyzer \ + codespell + +# Tools needed for the test suite. +dnf install --setopt=install_weak_deps=False -y \ + findutils \ + file \ + jq \ + which + +# Packages needed to test CTest. +dnf install --setopt=install_weak_deps=False -y \ + breezy \ + subversion \ + mercurial + +# Packages needed to test CPack. +dnf install --setopt=install_weak_deps=False -y \ + rpm-build + +# Packages needed to test find modules. +dnf install --setopt=install_weak_deps=False -y \ + 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 \ + java-11-openjdk-devel \ + jsoncpp-devel \ + lapack-devel \ + libarchive-devel \ + libcurl-devel \ + libicu-devel \ + libinput-devel systemd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + postgresql-server-devel \ + libtiff-devel \ + libuv-devel \ + libxml2-devel \ + libxslt-devel \ + mpich-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 \ + xalan-c-devel \ + xerces-c-devel \ + xz-devel + +dnf clean all + +# Fedora no longer packages python2 numpy. +curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py +python2 get-pip.py +rm get-pip.py +pip2.7 install numpy + +# Perforce +curl -L -O https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz +tar -C /usr/local/bin -xvzf helix-core-server.tgz -- p4 p4d +rm helix-core-server.tgz diff --git a/.gitlab/ci/docker/fedora36/install_ispc.sh b/.gitlab/ci/docker/fedora36/install_ispc.sh new file mode 100755 index 0000000..fdc14b5 --- /dev/null +++ b/.gitlab/ci/docker/fedora36/install_ispc.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +readonly version="1.13.0" +readonly sha256sum="8ab1189bd5db596b3eee9d9465d3528b6626a7250675d67102761bb0d284cd21" + +readonly filename="ispc-v$version-linux" +readonly tarball="$filename.tar.gz" + +echo "$sha256sum $tarball" > ispc.sha256sum +curl -OL "https://github.com/ispc/ispc/releases/download/v$version/$tarball" +sha256sum --check ispc.sha256sum +tar --strip-components=1 -C /usr/local -xf "$tarball" "$filename/bin/ispc" diff --git a/.gitlab/ci/docker/fedora36/install_rvm.sh b/.gitlab/ci/docker/fedora36/install_rvm.sh new file mode 100755 index 0000000..0011f87 --- /dev/null +++ b/.gitlab/ci/docker/fedora36/install_rvm.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +gpg2 --keyserver hkps://keyserver.ubuntu.com \ + --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB + +dnf install --setopt=install_weak_deps=False -y \ + findutils \ + procps \ + which + +curl -sSL https://get.rvm.io | bash -s stable + +# keep version in sync with `env_fedora*_makefiles.cmake` +/usr/local/rvm/bin/rvm install ruby-3.0.4 + +tar -C /usr/local -cf /root/rvm.tar rvm -- cgit v0.12