Skip to content

Commit 50e1ce5

Browse files
committed
Use updated freebsd-vagrant-action and boxes
1 parent 54fe8ea commit 50e1ce5

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/actions/cmake/package/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
steps:
55
- name: Set `CPACK_PACKAGE_FILE_NAME`
66
run: |
7-
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}
7+
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}
88
shell: bash --noprofile --norc -euxo pipefail {0}
99

1010
- name: Set `CPACK_OPTIONS`

.github/actions/cmake/test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515

1616
- name: Set `TEST_ARTIFACT_NAME`
1717
run: |
18-
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}
18+
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}
1919
shell: bash --noprofile --norc -euxo pipefail {0}
2020
if: failure()
2121

.github/actions/coverage/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ runs:
5858

5959
- name: Set `COVERAGE_ARTIFACT_NAME`
6060
run: |
61-
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}
61+
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}
6262
shell: bash --noprofile --norc -euxo pipefail {0}
6363

6464
- name: Upload `mod_tile` coverage artifacts

.github/actions/dependencies/build-and-install/mapnik/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
path: |
1616
mapnik-build
1717
mapnik-src
18-
key: ${{ matrix.image || matrix.os || matrix.box_generic || github.job }}-${{ matrix.compiler }}-mapnik-${{ inputs.version }}
18+
key: ${{ matrix.image || matrix.os || matrix.box_freebsd || github.job }}-${{ matrix.compiler }}-mapnik-${{ inputs.version }}
1919

2020
- name: Checkout `Mapnik`
2121
uses: actions/checkout@v4

.github/workflows/build-and-test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,22 +223,22 @@ jobs:
223223
LIBRARY_PATH: /usr/local/lib
224224
TMPDIR: /tmp
225225
name: >-
226-
${{ matrix.box_generic }}
226+
${{ matrix.box_freebsd }}
227227
(${{ matrix.build_system }})
228228
(${{ matrix.compiler }})
229229
runs-on: ubuntu-latest
230230
strategy:
231231
matrix:
232-
box_generic:
233-
- freebsd13
232+
box_freebsd:
233+
- FreeBSD-13.4-STABLE
234234
build_system:
235235
- CMake
236236
compiler:
237237
- LLVM
238238
on_default_branch:
239239
- ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') || contains(github.ref, 'CI') }}
240240
include:
241-
- box_generic: freebsd14
241+
- box_freebsd: FreeBSD-14.1-STABLE
242242
build_system: CMake
243243
compiler: LLVM
244244
exclude:
@@ -254,9 +254,9 @@ jobs:
254254
echo "TEST_PARALLEL_LEVEL=$(nproc)" >> ${GITHUB_ENV}
255255
256256
- name: Provision VM
257-
uses: hummeltech/freebsd-vagrant-action@v2
257+
uses: hummeltech/freebsd-vagrant-action@v3
258258
with:
259-
box: generic/${{ matrix.box_generic }}
259+
box: freebsd/${{ matrix.box_freebsd }}
260260
cpus: ${{ env.BUILD_PARALLEL_LEVEL }}
261261
memory: 4096
262262

0 commit comments

Comments
 (0)