Skip to content

Commit

Permalink
Update GitHub Actions images (#352)
Browse files Browse the repository at this point in the history
* Remove `macOS 11`
  * Homebrew no longer supports [`macOS < 12`](https://docs.brew.sh/Installation)
* Add `FreeBSD 14`
* Remove `FreeBSD 12`
* Add `Fedora 39`
* Remove `Fedora 37`
* Add `Ubuntu` rolling
* Allow tests using latest `Mapnik` to fail
  * Updates occasionally cause failures to occur
  • Loading branch information
hummeltech authored Nov 26, 2023
1 parent e94fde2 commit bc8126c
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 18 deletions.
62 changes: 46 additions & 16 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ jobs:
${{ matrix.image }}
(${{ matrix.build_system }})
(${{ matrix.compiler }})
${{ matrix.mapnik_latest && '(Latest Mapnik)' || '' }}
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -20,17 +19,16 @@ jobs:
- "debian:11"
- "debian:12"
- "debian:testing"
- "fedora:37"
- "fedora:38"
- "fedora:39"
- "fedora:rawhide"
- "opensuse/leap:15"
- "ubuntu:20.04"
- "ubuntu:rolling"
build_system:
- CMake
compiler:
- GNU
mapnik_latest:
- false
on_default_branch:
- ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') }}
include:
Expand All @@ -46,14 +44,6 @@ jobs:
- image: "ubuntu:22.04"
build_system: CMake
compiler: LLVM
- image: "debian:12"
build_system: CMake
compiler: GNU
mapnik_latest: true
- image: "ubuntu:22.04"
build_system: CMake
compiler: GNU
mapnik_latest: true
exclude:
- on_default_branch: false
fail-fast: false
Expand Down Expand Up @@ -91,6 +81,47 @@ jobs:
- name: Install `mod_tile`
uses: ./.github/actions/install

Linux-Latest-Mapnik:
continue-on-error: true
name: >-
${{ matrix.image }}
(Latest Mapnik)
(${{ matrix.build_system }})
(${{ matrix.compiler }})
runs-on: ubuntu-latest
strategy:
matrix:
image:
- "debian:12"
- "ubuntu:22.04"
build_system:
- CMake
compiler:
- GNU
mapnik_latest:
- true
fail-fast: false
container:
env:
CC: ${{ matrix.compiler == 'LLVM' && 'clang' || 'gcc' }}
CXX: ${{ matrix.compiler == 'LLVM' && 'clang++' || 'g++' }}
image: ${{ matrix.image }}
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install dependencies
uses: ./.github/actions/dependencies/install

- name: Build `mod_tile`
uses: ./.github/actions/build

- name: Test `mod_tile`
uses: ./.github/actions/test

- name: Install `mod_tile`
uses: ./.github/actions/install

macOS:
env:
CFLAGS: -Wno-implicit-function-declaration
Expand All @@ -105,7 +136,6 @@ jobs:
fail-fast: false
matrix:
os:
- macos-11
- macos-12
build_system:
- CMake
Expand Down Expand Up @@ -145,7 +175,7 @@ jobs:
FreeBSD:
continue-on-error: true
env:
BUILD_PARALLEL_LEVEL: 4
BUILD_PARALLEL_LEVEL: 2
LIBRARY_PATH: /usr/local/lib
TMPDIR: /tmp
name: >-
Expand All @@ -156,15 +186,15 @@ jobs:
strategy:
matrix:
box_generic:
- freebsd12
- freebsd13
build_system:
- CMake
compiler:
- LLVM
on_default_branch:
- ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') }}
include:
- box_generic: freebsd13
- box_generic: freebsd14
build_system: CMake
compiler: LLVM
exclude:
Expand Down
2 changes: 1 addition & 1 deletion docs/build/building_on_fedora.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This document provides users with step-by-step instructions on how to compile an

Please see our [Continuous Integration script](/.github/workflows/build-and-test.yml) for more details.

## Fedora 34/35/36/37/38
## Fedora 34/35/36/37/38/39

```shell
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion docs/build/building_on_freebsd.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This document provides users with step-by-step instructions on how to compile an

Please see our [Continuous Integration script](/.github/workflows/build-and-test.yml) for more details.

## FreeBSD 12/13
## FreeBSD 12/13/14

```shell
#!/usr/bin/env sh
Expand Down

0 comments on commit bc8126c

Please sign in to comment.