From bd62d2ecf3c9e4753113c077e33aa96482f0edb0 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 12 Nov 2020 09:42:28 -0500 Subject: ci: update to Fedora 33 for Linux builds --- .gitlab/ci/docker/fedora31/Dockerfile | 18 ------- .gitlab/ci/docker/fedora31/install_deps.sh | 80 ------------------------------ .gitlab/ci/docker/fedora31/install_ispc.sh | 14 ------ .gitlab/ci/docker/fedora31/install_rvm.sh | 18 ------- .gitlab/ci/docker/fedora33/Dockerfile | 18 +++++++ .gitlab/ci/docker/fedora33/install_deps.sh | 80 ++++++++++++++++++++++++++++++ .gitlab/ci/docker/fedora33/install_ispc.sh | 14 ++++++ .gitlab/ci/docker/fedora33/install_rvm.sh | 21 ++++++++ 8 files changed, 133 insertions(+), 130 deletions(-) delete mode 100644 .gitlab/ci/docker/fedora31/Dockerfile delete mode 100755 .gitlab/ci/docker/fedora31/install_deps.sh delete mode 100755 .gitlab/ci/docker/fedora31/install_ispc.sh delete mode 100755 .gitlab/ci/docker/fedora31/install_rvm.sh create mode 100644 .gitlab/ci/docker/fedora33/Dockerfile create mode 100755 .gitlab/ci/docker/fedora33/install_deps.sh create mode 100755 .gitlab/ci/docker/fedora33/install_ispc.sh create mode 100755 .gitlab/ci/docker/fedora33/install_rvm.sh diff --git a/.gitlab/ci/docker/fedora31/Dockerfile b/.gitlab/ci/docker/fedora31/Dockerfile deleted file mode 100644 index 80ab379..0000000 --- a/.gitlab/ci/docker/fedora31/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM fedora:31 as rvm-build -MAINTAINER Ben Boeckel - -COPY install_rvm.sh /root/install_rvm.sh -RUN sh /root/install_rvm.sh - -FROM fedora:31 -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/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh deleted file mode 100755 index c1391e3..0000000 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -set -e - -# Install build requirements. -dnf install --setopt=install_weak_deps=False -y \ - ncurses-devel \ - openssl-devel \ - qt5-qtbase-devel - -# Install development tools. -dnf install --setopt=install_weak_deps=False -y \ - clang-tools-extra \ - gcc-c++ \ - git-core \ - make - -# Install documentation tools. -dnf install --setopt=install_weak_deps=False -y \ - python3-sphinx \ - texinfo \ - qt5-qttools-devel - -# Tools needed for the test suite. -dnf install --setopt=install_weak_deps=False -y \ - findutils \ - file \ - which - -# 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 \ - doxygen \ - expat-devel \ - fontconfig-devel \ - freetype-devel \ - gdal-devel \ - gettext \ - giflib-devel \ - glew-devel \ - gmock \ - gnutls-devel \ - gsl-devel \ - gtest-devel \ - gtk2-devel \ - jsoncpp-devel \ - lapack-devel \ - libarchive-devel \ - libcurl-devel \ - libinput-devel systemd-devel \ - libjpeg-turbo-devel \ - libpng-devel \ - libpq-devel postgresql-server-devel \ - libtiff-devel \ - libuv-devel \ - libxml2-devel \ - libxslt-devel \ - openmpi-devel \ - patch \ - perl \ - protobuf-devel protobuf-c-devel protobuf-lite-devel \ - pypy2 pypy2-devel \ - pypy3 pypy3-devel \ - python2 python2-devel python2-numpy \ - 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 diff --git a/.gitlab/ci/docker/fedora31/install_ispc.sh b/.gitlab/ci/docker/fedora31/install_ispc.sh deleted file mode 100755 index fdc14b5..0000000 --- a/.gitlab/ci/docker/fedora31/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/fedora31/install_rvm.sh b/.gitlab/ci/docker/fedora31/install_rvm.sh deleted file mode 100755 index 2332ab7..0000000 --- a/.gitlab/ci/docker/fedora31/install_rvm.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -gpg2 --keyserver hkp://pool.sks-keyservers.net \ - --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ - 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - -dnf install --setopt=install_weak_deps=False -y \ - findutils \ - procps \ - which - -curl -sSL https://get.rvm.io | bash -s stable - -/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/fedora33/Dockerfile b/.gitlab/ci/docker/fedora33/Dockerfile new file mode 100644 index 0000000..8ebcb9e --- /dev/null +++ b/.gitlab/ci/docker/fedora33/Dockerfile @@ -0,0 +1,18 @@ +FROM fedora:33 as rvm-build +MAINTAINER Ben Boeckel + +COPY install_rvm.sh /root/install_rvm.sh +RUN sh /root/install_rvm.sh + +FROM fedora:33 +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/fedora33/install_deps.sh b/.gitlab/ci/docker/fedora33/install_deps.sh new file mode 100755 index 0000000..c1391e3 --- /dev/null +++ b/.gitlab/ci/docker/fedora33/install_deps.sh @@ -0,0 +1,80 @@ +#!/bin/sh + +set -e + +# Install build requirements. +dnf install --setopt=install_weak_deps=False -y \ + ncurses-devel \ + openssl-devel \ + qt5-qtbase-devel + +# Install development tools. +dnf install --setopt=install_weak_deps=False -y \ + clang-tools-extra \ + gcc-c++ \ + git-core \ + make + +# Install documentation tools. +dnf install --setopt=install_weak_deps=False -y \ + python3-sphinx \ + texinfo \ + qt5-qttools-devel + +# Tools needed for the test suite. +dnf install --setopt=install_weak_deps=False -y \ + findutils \ + file \ + which + +# 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 \ + doxygen \ + expat-devel \ + fontconfig-devel \ + freetype-devel \ + gdal-devel \ + gettext \ + giflib-devel \ + glew-devel \ + gmock \ + gnutls-devel \ + gsl-devel \ + gtest-devel \ + gtk2-devel \ + jsoncpp-devel \ + lapack-devel \ + libarchive-devel \ + libcurl-devel \ + libinput-devel systemd-devel \ + libjpeg-turbo-devel \ + libpng-devel \ + libpq-devel postgresql-server-devel \ + libtiff-devel \ + libuv-devel \ + libxml2-devel \ + libxslt-devel \ + openmpi-devel \ + patch \ + perl \ + protobuf-devel protobuf-c-devel protobuf-lite-devel \ + pypy2 pypy2-devel \ + pypy3 pypy3-devel \ + python2 python2-devel python2-numpy \ + 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 diff --git a/.gitlab/ci/docker/fedora33/install_ispc.sh b/.gitlab/ci/docker/fedora33/install_ispc.sh new file mode 100755 index 0000000..fdc14b5 --- /dev/null +++ b/.gitlab/ci/docker/fedora33/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/fedora33/install_rvm.sh b/.gitlab/ci/docker/fedora33/install_rvm.sh new file mode 100755 index 0000000..6d4fa97 --- /dev/null +++ b/.gitlab/ci/docker/fedora33/install_rvm.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +gpg2 --keyserver hkp://pool.sks-keyservers.net \ + --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ + 7D2BAF1CF37B13E2069D6956105BD0E739499BDB + +dnf install --setopt=install_weak_deps=False -y \ + findutils \ + procps \ + which + +curl -sSL https://get.rvm.io | bash -s stable + +# This is intentionally an older version. +# If updating, the associated `env_fedora*_makefiles.cmake` file needs updated +# as well. +/usr/local/rvm/bin/rvm install ruby-2.7.0 + +tar -C /usr/local -cf /root/rvm.tar rvm -- cgit v0.12