sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runners - use explicit versioning + remove macos-13

Browse source
This commit is contained in:
Artem Pavlenko 2024-06-14 09:30:55 +01:00
parent 63d7e51b84
commit f91f522e71
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/build_and_test.yml vendored
View file

@ -15,7 +15,7 @@ env:
jobs: jobs:
checkSource: checkSource:
name: Check Source Code name: Check Source Code
runs-on: ubuntu-latest runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -35,20 +35,17 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- macos-13
- macos-14 - macos-14
- ubuntu-latest - ubuntu-24.04
- windows-2019 - windows-2022
cxx-standard: cxx-standard:
- 17 - 17
include: include:
- os: macos-13
mono: mono
- os: macos-14 - os: macos-14
mono: mono mono: mono
- os: ubuntu-latest - os: ubuntu-24.04
mono: mono mono: mono
- os: windows-2019 - os: windows-2022
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -88,7 +85,7 @@ jobs:
run: | run: |
LC_RUNNER_OS=$(echo "${RUNNER_OS}" | perl -ne "print lc") LC_RUNNER_OS=$(echo "${RUNNER_OS}" | perl -ne "print lc")
if [ "${RUNNER_OS}" == "macOS" ]; then if [ "${RUNNER_OS}" == "macOS" ]; then
MACOS_ARCH=${{ (matrix.os == 'macos-14' || matrix.os == 'macos-latest') && 'arm64' || 'x64' }} MACOS_ARCH=${{ matrix.os == 'macos-14' && 'arm64' || 'x64' }}
echo "PRESET=${LC_RUNNER_OS}-ci-${MACOS_ARCH}" >> ${GITHUB_ENV} echo "PRESET=${LC_RUNNER_OS}-ci-${MACOS_ARCH}" >> ${GITHUB_ENV}
else else
echo "PRESET=${LC_RUNNER_OS}-ci" >> ${GITHUB_ENV} echo "PRESET=${LC_RUNNER_OS}-ci" >> ${GITHUB_ENV}