Add Fedora 43 to CI pipeline (#493)

hummeltech · web-flow · commit 72ac94d6e365 · 2026-02-11T12:24:56.000-07:00
Also some Docker updates to simplify testing with an actual dataset and mapnik.xml file.
diff --git a/.github/actions/cmake/package/action.yml b/.github/actions/cmake/package/action.yml
@@ -33,7 +33,7 @@ runs:
       working-directory: build
 
     - name: Upload `mod_tile` package artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         if-no-files-found: ignore
         name: Package Artifacts - ${{ env.CPACK_PACKAGE_FILE_NAME }}${{ matrix.mapnik_latest && ' (Latest Mapnik)' || '' }}
diff --git a/.github/actions/cmake/test/action.yml b/.github/actions/cmake/test/action.yml
@@ -20,7 +20,7 @@ runs:
       if: failure()
 
     - name: Upload `mod_tile` test artifacts on failure
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: Test Artifacts - ${{ env.TEST_ARTIFACT_NAME }}
         path: build/tests
diff --git a/.github/actions/coverage/action.yml b/.github/actions/coverage/action.yml
@@ -62,7 +62,7 @@ runs:
       shell: bash --noprofile --norc -euxo pipefail {0}
 
     - name: Upload `mod_tile` coverage artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: Coverage Artifacts - ${{ env.COVERAGE_ARTIFACT_NAME }}${{ matrix.mapnik_latest && ' (Latest Mapnik)' || '' }}
         path: |
diff --git a/.github/actions/dependencies/build-and-install/mapnik/action.yml b/.github/actions/dependencies/build-and-install/mapnik/action.yml
@@ -10,15 +10,15 @@ runs:
   steps:
     - name: Cache "Checkout `Mapnik`" & "Build `Mapnik`"
       id: cache-mapnik
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           mapnik-build
           mapnik-src
         key: ${{ matrix.image || matrix.os || matrix.box_freebsd || github.job }}-${{ matrix.compiler }}-mapnik-${{ inputs.version }}
 
     - name: Checkout `Mapnik`
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         path: mapnik-src
         ref: ${{ inputs.version != 'latest' && format('v{0}', inputs.version) || '' }}
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -22,8 +22,8 @@ jobs:
         image:
           - "debian:12"
           - "debian:13"
-          - "fedora:41"
           - "fedora:42"
+          - "fedora:43"
           - "opensuse/leap:15"
           - "ubuntu:22.04"
         on_default_branch:
@@ -77,7 +77,7 @@ jobs:
         if: startsWith(matrix.image, 'opensuse/')
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install dependencies
         uses: ./.github/actions/dependencies/install
@@ -134,7 +134,7 @@ jobs:
       image: ${{ matrix.image }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install dependencies
         uses: ./.github/actions/dependencies/install
@@ -191,7 +191,7 @@ jobs:
           - on_default_branch: false
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install dependencies
         uses: ./.github/actions/dependencies/install
@@ -257,7 +257,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set `BUILD_PARALLEL_LEVEL` & `TEST_PARALLEL_LEVEL`
         run: |
diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Lint with hadolint
-        uses: hadolint/hadolint-action@v3.1.0
+        uses: hadolint/hadolint-action@v3.3.0
         with:
           dockerfile: Dockerfile*
           failure-threshold: warning
@@ -34,8 +34,8 @@ jobs:
           - archlinux
           - debian-12
           - debian-13
-          - fedora-41
           - fedora-42
+          - fedora-43
           - opensuse-leap-15
           - opensuse-leap-16
           - ubuntu-22.04
@@ -60,7 +60,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Build & Start
         run: docker compose up --build --detach ${{ matrix.service-name }}
diff --git a/.github/workflows/flawfinder-analysis.yml b/.github/workflows/flawfinder-analysis.yml
@@ -20,7 +20,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: flawfinder_scan
         uses: david-a-wheeler/flawfinder@2.0.19
@@ -29,6 +29,6 @@ jobs:
           output: "flawfinder_results.sarif"
 
       - name: Upload analysis results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: ${{github.workspace}}/flawfinder_results.sarif
diff --git a/.github/workflows/install-package-and-test.yml b/.github/workflows/install-package-and-test.yml
@@ -31,7 +31,7 @@ jobs:
       image: ${{ matrix.image }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install mod_tile & renderd
         uses: ./.github/actions/dependencies/install/apt-get
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Provision environment
         uses: ./.github/actions/dependencies/install/apt-get
         with:
@@ -55,7 +55,7 @@ jobs:
           git diff --patch > ArtisticStyleFormattingFixes.patch
         if: failure()
       - name: Upload `ArtisticStyleFormattingFixes.patch` file
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ArtisticStyleFormattingFixes.patch
           path: ArtisticStyleFormattingFixes.patch
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Provision environment
         run: pip install --user cmakelint
       - name: Run linter
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Provision environment
         run: npm install prettier
       - name: Run linter
diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile
@@ -35,6 +35,7 @@ RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cac
         git \
         glib2 \
         iniparser \
+        jemalloc \
         lcov \
         libmemcached \
         make \
@@ -53,7 +54,8 @@ RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL &
         -DCMAKE_INSTALL_PREFIX:PATH=/usr \
         -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
         -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
-        -DENABLE_TESTS:BOOL=ON && \
+        -DENABLE_TESTS:BOOL=ON \
+        -DMALLOC_LIB:STRING=jemalloc && \
     cmake --build .
 RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \
     ctest --output-on-failure
@@ -76,6 +78,7 @@ RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cac
         curl \
         glib2 \
         iniparser \
+        jemalloc \
         libmemcached \
         mapnik \
         memcached \
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -223,6 +223,12 @@ services:
       <<: *build_defaults_fedora
       args:
         fedora_version: "42"
+  fedora-43:
+    <<: *service_defaults
+    build:
+      <<: *build_defaults_fedora
+      args:
+        fedora_version: "43"
   fedora-rawhide:
     <<: *service_defaults
     build:
@@ -316,7 +322,7 @@ services:
       <<: *build_defaults_ubuntu
       args:
         libiniparser_version: 4
-        libmapnik_version: "4.1"
+        libmapnik_version: "4.2"
         runner_additional_packages: >-
           curl
           gdal-bin
diff --git a/docker/full-entrypoint.sh b/docker/full-entrypoint.sh
@@ -1,49 +1,37 @@
 #!/usr/bin/env sh
 
-if [ ! -f /opt/styles/mapnik.xml ]
-then
-    git clone https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 /opt/openstreetmap-carto
+export DATADIR=/opt/data
+export FONTDIR=/opt/fonts
+export MAPNIK_XML=/opt/styles/mapnik.xml
 
-    cp --archive /opt/openstreetmap-carto/patterns /opt/openstreetmap-carto/symbols /opt/styles/
+sed -i \
+    -e "s#^xml=.*#xml=${MAPNIK_XML}#Ig" \
+    -e "s#^pid_file=#num_threads=-1\npid_file=#Ig" \
+    -e "s#^font_dir=.*#font_dir=${FONTDIR}#Ig" \
+    /etc/renderd.conf
 
-    python3 /opt/openstreetmap-carto/scripts/get-external-data.py --cache --config /opt/openstreetmap-carto/external-data.yml --data /opt/data
+if [ ! -f ${MAPNIK_XML} ]
+then
+    export OPENSTREETMAP_CARTO_DIR=/opt/openstreetmap-carto
+    git clone https://github.com/openstreetmap-carto/openstreetmap-carto.git --depth 1 ${OPENSTREETMAP_CARTO_DIR}
 
-    cd /opt && /opt/openstreetmap-carto/scripts/get-fonts.sh && cd -
+    cp --archive ${OPENSTREETMAP_CARTO_DIR}/patterns ${OPENSTREETMAP_CARTO_DIR}/symbols /opt/styles/
 
-    psql --command "CREATE EXTENSION postgis;" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
-    psql --command "CREATE EXTENSION hstore;" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
-    psql --command "ALTER TABLE geometry_columns OWNER TO ${PGUSER};" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
-    psql --command "ALTER TABLE spatial_ref_sys OWNER TO ${PGUSER};" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
+    export EXTERNAL_DATA_SCRIPT_FLAGS="--cache --config ${OPENSTREETMAP_CARTO_DIR}/external-data.yml --data ${DATADIR} --no-update"
+    export OSM2PGSQL_DATAFILE="${DATADIR}/region.osm.pbf"
 
-    if [ ! -f /opt/data/region.osm.pbf ]
+    if [ ! -f ${OSM2PGSQL_DATAFILE} ]
     then
-        curl --location "${DOWNLOAD_PBF:-http://download.geofabrik.de/asia/vietnam-latest.osm.pbf}" --output /opt/data/region.osm.pbf
+        curl --location "${DOWNLOAD_PBF:-http://download.geofabrik.de/asia/vietnam-latest.osm.pbf}" --output ${OSM2PGSQL_DATAFILE}
     fi
 
-    osm2pgsql \
-        --create \
-        --database "${PGDATABASE}" \
-        --host "${PGHOST}" \
-        --hstore \
-        --number-processes "$(nproc)" \
-        --slim \
-        --tag-transform-script /opt/openstreetmap-carto/openstreetmap-carto.lua \
-        --user "${PGUSER}" \
-        -G \
-        -S /opt/openstreetmap-carto/openstreetmap-carto.style \
-        /opt/data/region.osm.pbf
-
-    psql --dbname "${PGDATABASE}" --file /opt/openstreetmap-carto/indexes.sql --host "${PGHOST}" --user "${PGUSER}"
+    cd ${OPENSTREETMAP_CARTO_DIR}
+
+    sh scripts/docker-startup.sh import
 
     npm install --global carto
-    carto /opt/openstreetmap-carto/project.mml > /opt/styles/mapnik.xml
+    carto ${OPENSTREETMAP_CARTO_DIR}/project.mml > ${MAPNIK_XML}
 fi
 
-sed -i \
-    -e 's#/usr/share/renderd/example-map/mapnik.xml#/opt/styles/mapnik.xml#g' \
-    -e 's/pid_file=/num_threads=-1\npid_file=/g' \
-    -e 's#font_dir=.*#font_dir=/opt/fonts#g' \
-    /etc/renderd.conf
-
 apachectl -e debug -k start
 renderd --foreground
diff --git a/docs/build/building_on_fedora.md b/docs/build/building_on_fedora.md
@@ -6,7 +6,7 @@ Please see our [Continuous Integration script](/.github/workflows/build-and-test
 
 A Docker-based building & testing setup pipeline is also available [here](/docker) for your convenience.
 
-## Fedora 34/35/36/37/38/39/40/41/42
+## Fedora 34/35/36/37/38/39/40/41/42/43
 
 ```shell
 #!/usr/bin/env bash
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -153,6 +153,7 @@ function(add_good_tile_download_test TEST_NAME TEST_URL FILE_NAME FIXTURE_NAME R
   )
   add_test(NAME check_tile_${TEST_NAME}
     COMMAND ${BASH} -c "
+      ${SHA256SUM_EXECUTABLE} ${FILE_NAME} &&
       ${SHA256SUM_EXECUTABLE} -c tiles.sha256sum | ${GREP_EXECUTABLE} ${FILE_NAME} | ${GREP_EXECUTABLE} -q OK
     "
     WORKING_DIRECTORY tests
diff --git a/tests/tiles.sha256sum b/tests/tiles.sha256sum
@@ -44,6 +44,23 @@ f3e505417c5ab18a7dae0827a0c915905c412bad486497b2a0fb4efffd19d420  tile.png256.me
 f3e505417c5ab18a7dae0827a0c915905c412bad486497b2a0fb4efffd19d420  tile.png256.memcached_custom.1
 f3e505417c5ab18a7dae0827a0c915905c412bad486497b2a0fb4efffd19d420  tile.png256.memcached_default.0
 f3e505417c5ab18a7dae0827a0c915905c412bad486497b2a0fb4efffd19d420  tile.png256.memcached_default.1
+# Newer libpng & zlib-ng 2.3.3
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.htcp.file.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.htcp.file.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.add_tile_config.file.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.add_tile_config.file.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.add_tile_config.memcached_custom.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.add_tile_config.memcached_custom.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.add_tile_config.memcached_default.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.add_tile_config.memcached_default.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.parameterization.file.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.parameterization.file.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.png256.file.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.png256.file.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.png256.memcached_custom.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.png256.memcached_custom.1
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.png256.memcached_default.0
+16c8af8d51df2d5d062a604802d453777c405085c5223b68470cdce63b169247  tile.png256.memcached_default.1
 # libjpeg
 e09c3406c02f03583dadf0c8404c2d3efdc06a40d399e381ed2f47f49fde42d7  tile.jpg.file.0
 e09c3406c02f03583dadf0c8404c2d3efdc06a40d399e381ed2f47f49fde42d7  tile.jpg.file.1
