Replace Fedora 36 with Fedora 38 in GitHub Actions (#323)

openstreetmap · Jul 20, 2023 · 5d9fcda · 5d9fcda
1 parent 5d70617
commit 5d9fcda
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/actions/cmake/build/action.yml b/.github/actions/cmake/build/action.yml
@@ -11,11 +11,11 @@ runs:
 
     - name: Prepare `build` directory
       run: |
-        cmake -S . -B build \
+        cmake -B build -S . \
           -LA \
-          -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} \
-          -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-/usr/local} \
-          -DENABLE_TESTS=1
+          -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE:-Debug} \
+          -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX:-/usr/local} \
+          -DENABLE_TESTS:BOOL=ON
       shell: bash --noprofile --norc -euxo pipefail {0}
 
     - name: Build `mod_tile`

diff --git a/.github/actions/dependencies/build-and-install/mapnik/latest/action.yml b/.github/actions/dependencies/build-and-install/mapnik/latest/action.yml
@@ -25,7 +25,7 @@ runs:
         cmake -S mapnik-src -B mapnik-build \
           -DBUILD_DEMO_VIEWER:BOOL=OFF \
           -DBUILD_TESTING:BOOL=OFF \
-          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_BUILD_TYPE:STRING=Release \
           -DCMAKE_INSTALL_PREFIX:PATH=/usr
         cmake --build mapnik-build
       shell: bash --noprofile --norc -euxo pipefail {0}

diff --git a/.github/actions/dependencies/install/action.yml b/.github/actions/dependencies/install/action.yml
@@ -78,7 +78,7 @@ inputs:
       gdal-devel
       harfbuzz-devel
       libicu-devel
-      libjpeg-turbo-devel
+      libjpeg-devel
       libpng-devel
       libtiff-devel
       libwebp-devel

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -20,8 +20,8 @@ jobs:
           - 'debian:11'
           - 'debian:12'
           - 'debian:testing'
-          - 'fedora:36'
           - 'fedora:37'
+          - 'fedora:38'
           - 'fedora:rawhide'
           - 'ubuntu:20.04'
         build_system: