Use updated freebsd-vagrant-action and boxes

openstreetmap · Nov 6, 2024 · 50e1ce5 · 50e1ce5
1 parent 54fe8ea
commit 50e1ce5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/actions/cmake/package/action.yml b/.github/actions/cmake/package/action.yml
@@ -4,7 +4,7 @@ runs:
   steps:
     - name: Set `CPACK_PACKAGE_FILE_NAME`
       run: |
-        echo "CPACK_PACKAGE_FILE_NAME=mod_tile-${GITHUB_SHA}-$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV}
+        echo "CPACK_PACKAGE_FILE_NAME=mod_tile-${GITHUB_SHA}-$(echo ${{ matrix.image || matrix.os || matrix.box_freebsd || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV}
       shell: bash --noprofile --norc -euxo pipefail {0}
 
     - name: Set `CPACK_OPTIONS`

diff --git a/.github/actions/cmake/test/action.yml b/.github/actions/cmake/test/action.yml
@@ -15,7 +15,7 @@ runs:
 
     - name: Set `TEST_ARTIFACT_NAME`
       run: |
-        echo "TEST_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV}
+        echo "TEST_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_freebsd || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV}
       shell: bash --noprofile --norc -euxo pipefail {0}
       if: failure()
 

diff --git a/.github/actions/coverage/action.yml b/.github/actions/coverage/action.yml
@@ -58,7 +58,7 @@ runs:
 
     - name: Set `COVERAGE_ARTIFACT_NAME`
       run: |
-        echo "COVERAGE_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV}
+        echo "COVERAGE_ARTIFACT_NAME=$(echo ${{ matrix.image || matrix.os || matrix.box_freebsd || github.job }}-${{ matrix.build_system }}-${{ matrix.compiler }} | sed 's/[^0-9a-zA-Z-]/_/g')" >> ${GITHUB_ENV}
       shell: bash --noprofile --norc -euxo pipefail {0}
 
     - name: Upload `mod_tile` coverage artifacts

diff --git a/.github/actions/dependencies/build-and-install/mapnik/action.yml b/.github/actions/dependencies/build-and-install/mapnik/action.yml
@@ -15,7 +15,7 @@ runs:
         path: |
           mapnik-build
           mapnik-src
-        key: ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.compiler }}-mapnik-${{ inputs.version }}
+        key: ${{ matrix.image || matrix.os || matrix.box_freebsd || github.job }}-${{ matrix.compiler }}-mapnik-${{ inputs.version }}
 
     - name: Checkout `Mapnik`
       uses: actions/checkout@v4

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -223,22 +223,22 @@ jobs:
       LIBRARY_PATH: /usr/local/lib
       TMPDIR: /tmp
     name: >-
-      ${{ matrix.box_generic }}
+      ${{ matrix.box_freebsd }}
       (${{ matrix.build_system }})
       (${{ matrix.compiler }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        box_generic:
-          - freebsd13
+        box_freebsd:
+          - FreeBSD-13.4-STABLE
         build_system:
           - CMake
         compiler:
           - LLVM
         on_default_branch:
           - ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') || contains(github.ref, 'CI') }}
         include:
-          - box_generic: freebsd14
+          - box_freebsd: FreeBSD-14.1-STABLE
             build_system: CMake
             compiler: LLVM
         exclude:
@@ -254,9 +254,9 @@ jobs:
           echo "TEST_PARALLEL_LEVEL=$(nproc)" >> ${GITHUB_ENV}
 
       - name: Provision VM
-        uses: hummeltech/freebsd-vagrant-action@v2
+        uses: hummeltech/freebsd-vagrant-action@v3
         with:
-          box: generic/${{ matrix.box_generic }}
+          box: freebsd/${{ matrix.box_freebsd }}
           cpus: ${{ env.BUILD_PARALLEL_LEVEL }}
           memory: 4096