Remove CentOS Stream 8 & CentOS 7 for CI and documentation (#438)

* Updates are no longer available for CentOS Stream 8 since the end of May 2024 * Updates will cease being available for CentOS 7 at the end of June 2024
openstreetmap · Jun 4, 2024 · 039a30e · 039a30e
1 parent 1ad4165
commit 039a30e
Show file tree

Hide file tree

Showing 26 changed files with 75 additions and 397 deletions.
diff --git a/.github/actions/cmake/build/action.yml b/.github/actions/cmake/build/action.yml
@@ -7,10 +7,10 @@ runs:
         cmake -B build -S . \
           -LA \
           -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE:-Release} \
-          -DCMAKE_INSTALL_LOCALSTATEDIR=${INSTALL_LOCALSTATEDIR:-/var} \
+          -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${INSTALL_LOCALSTATEDIR:-/var} \
           -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX:-/usr} \
-          -DCMAKE_INSTALL_RUNSTATEDIR=${INSTALL_RUNSTATEDIR:-/run} \
-          -DCMAKE_INSTALL_SYSCONFDIR=${INSTALL_SYSCONFDIR:-/etc} \
+          -DCMAKE_INSTALL_RUNSTATEDIR:PATH=${INSTALL_RUNSTATEDIR:-/run} \
+          -DCMAKE_INSTALL_SYSCONFDIR:PATH=${INSTALL_SYSCONFDIR:-/etc} \
           -DENABLE_TESTS:BOOL=ON
       shell: bash --noprofile --norc -euxo pipefail {0}
 

diff --git a/.github/actions/dependencies/install/yum/action.yml b/.github/actions/dependencies/install/yum/action.yml
@@ -18,15 +18,10 @@ runs:
       shell: bash --noprofile --norc -euxo pipefail {0}
       if: startsWith(matrix.image, 'quay.io/centos/centos:stream')
 
-    - name: Enable PowerTools repository (CentOS Stream 8)
-      run: dnf config-manager --set-enabled powertools
-      shell: bash --noprofile --norc -euxo pipefail {0}
-      if: matrix.image == 'quay.io/centos/centos:stream8'
-
-    - name: Enable CRB repository (CentOS Stream 9)
+    - name: Enable CRB repository (CentOS Stream)
       run: dnf config-manager --set-enabled crb
       shell: bash --noprofile --norc -euxo pipefail {0}
-      if: matrix.image == 'quay.io/centos/centos:stream9'
+      if: startsWith(matrix.image, 'quay.io/centos/centos:stream')
 
     - name: Install dependency package(s)
       run: |

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -25,7 +25,6 @@ jobs:
           - "fedora:39"
           - "fedora:40"
           - "opensuse/leap:15"
-          - "quay.io/centos/centos:stream8"
           - "quay.io/centos/centos:stream9"
           - "ubuntu:22.04"
         on_default_branch:

diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
@@ -17,8 +17,6 @@ jobs:
       matrix:
         service-name:
           - archlinux
-          - centos-7
-          - centos-stream-8
           - centos-stream-9
           - debian-11
           - debian-12

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ project(mod_tile
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "Sets the C++ standard.")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 

diff --git a/README.rst b/README.rst
@@ -66,7 +66,6 @@ We prepared instructions for you on how to build the software on the following
 distributions:
 
 * `Arch Linux </docs/build/building_on_arch_linux.md>`__
-* `CentOS </docs/build/building_on_centos.md>`__
 * `CentOS Stream </docs/build/building_on_centos_stream.md>`__
 * `Debian </docs/build/building_on_debian.md>`__
 * `Fedora </docs/build/building_on_fedora.md>`__

diff --git a/docker/README.md b/docker/README.md
@@ -5,8 +5,6 @@ For your convenience, we have provided a Docker-based building and testing metho
 ### The following distributions are currently supported:
 
 - archlinux _(Arch Linux)_ [[Dockerfile](/docker/archlinux/Dockerfile)]
-- centos-7 _(CentOS 7)_ [[Dockerfile](/docker/centos/7/Dockerfile)]
-- centos-stream-8 _(CentOS Stream 8)_ [[Dockerfile](/docker/centos/stream/Dockerfile)]
 - centos-stream-9 _(CentOS Stream 9)_ [[Dockerfile](/docker/centos/stream/Dockerfile)]
 - debian-10 _(Debian 10)_ [[Dockerfile](/docker/debian/Dockerfile)]
 - debian-11 _(Debian 11)_ [[Dockerfile](/docker/debian/Dockerfile)]

diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile
@@ -32,10 +32,11 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
     cmake -B . -S /tmp/mod_tile_src \
         -DCMAKE_BUILD_TYPE:STRING=Release \
-        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+        -DCMAKE_CXX_STANDARD:STRING=17 \
+        -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
         -DENABLE_TESTS:BOOL=ON && \
     cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \

diff --git a/docker/centos/7/Dockerfile b/docker/centos/7/Dockerfile
diff --git a/docker/centos/stream/Dockerfile b/docker/centos/stream/Dockerfile
@@ -56,15 +56,10 @@ RUN --mount=id=centos:stream${centos_stream_version}-mapnik:${mapnik_version},ta
     if [ ! -f SConstruct ]; then \
         curl --silent --location https://github.com/mapnik/mapnik/releases/download/v${mapnik_version}/mapnik-v${mapnik_version}.tar.bz2 \
             | tar --extract --bzip2 --strip-components=1 --file=-; \
-        if [ "${centos_stream_version}" = "9" ]; then \
-            curl --silent --location https://github.com/mapnik/mapnik/commit/8944e81367d2b3b91a41e24116e1813c01491e5d.patch \
-                | patch -Np1; \
-            curl --silent --location https://github.com/mapnik/mapnik/commit/83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \
-                | patch -F3 -Np1; \
-        fi \
-    fi; \
-    if [ "${centos_stream_version}" = "8" ]; then \
-        export CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; \
+        curl --silent --location https://github.com/mapnik/mapnik/commit/8944e81367d2b3b91a41e24116e1813c01491e5d.patch \
+            | patch -Np1; \
+        curl --silent --location https://github.com/mapnik/mapnik/commit/83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \
+            | patch -F3 -Np1; \
     fi; \
     bash configure \
         CPP_TESTS=False \
@@ -132,10 +127,10 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
     cmake -B . -S /tmp/mod_tile_src \
         -DCMAKE_BUILD_TYPE:STRING=Release \
-        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+        -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
         -DENABLE_TESTS:BOOL=ON && \
     cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \

diff --git a/docker/centos/stream/Dockerfile.autotools b/docker/centos/stream/Dockerfile.autotools
@@ -56,15 +56,10 @@ RUN --mount=id=centos:stream${centos_stream_version}-mapnik:${mapnik_version},ta
     if [ ! -f SConstruct ]; then \
         curl --silent --location https://github.com/mapnik/mapnik/releases/download/v${mapnik_version}/mapnik-v${mapnik_version}.tar.bz2 \
             | tar --extract --bzip2 --strip-components=1 --file=-; \
-        if [ "${centos_stream_version}" = "9" ]; then \
-            curl --silent --location https://github.com/mapnik/mapnik/commit/8944e81367d2b3b91a41e24116e1813c01491e5d.patch \
-                | patch -Np1; \
-            curl --silent --location https://github.com/mapnik/mapnik/commit/83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \
-                | patch -F3 -Np1; \
-        fi \
-    fi; \
-    if [ "${centos_stream_version}" = "8" ]; then \
-        export CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; \
+        curl --silent --location https://github.com/mapnik/mapnik/commit/8944e81367d2b3b91a41e24116e1813c01491e5d.patch \
+            | patch -Np1; \
+        curl --silent --location https://github.com/mapnik/mapnik/commit/83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \
+            | patch -F3 -Np1; \
     fi; \
     bash configure \
         CPP_TESTS=False \

diff --git a/docker/centos/stream/Dockerfile.mapnik-latest b/docker/centos/stream/Dockerfile.mapnik-latest
@@ -117,10 +117,10 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
     cmake -B . -S /tmp/mod_tile_src \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=/usr/include/boost1.78 \
-        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+        -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
         -DENABLE_TESTS:BOOL=ON && \
     cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
@@ -36,10 +36,10 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
     cmake -B . -S /tmp/mod_tile_src \
         -DCMAKE_BUILD_TYPE:STRING=Release \
-        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+        -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
         -DENABLE_TESTS:BOOL=ON && \
     cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -54,28 +54,6 @@ services:
       - styles:/opt/styles
       - tiles:/var/cache/renderd/tiles
       - ./full-entrypoint.sh:/entrypoint.sh:ro
-  centos-7:
-    <<: *service_defaults
-    build:
-      <<: *build_defaults
-      dockerfile: docker/centos/7/Dockerfile
-    ulimits:
-      nofile: 40000
-  centos-stream-8:
-    <<: *service_defaults
-    build:
-      <<: *build_defaults_centos_stream
-      args:
-        centos_stream_version: "8"
-        extra_repository: powertools
-  centos-stream-8-autotools:
-    <<: *service_defaults
-    build:
-      <<: *build_defaults_centos_stream
-      args:
-        centos_stream_version: "8"
-        extra_repository: powertools
-      dockerfile: docker/centos/stream/Dockerfile.autotools
   centos-stream-9:
     <<: *service_defaults
     build:

diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
@@ -31,10 +31,10 @@ WORKDIR /tmp/mod_tile_build
 RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
     cmake -B . -S /tmp/mod_tile_src \
         -DCMAKE_BUILD_TYPE:STRING=Release \
-        -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_RUNSTATEDIR=/run \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+        -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
+        -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
         -DENABLE_TESTS:BOOL=ON && \
     cmake --build .
 RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \