From 68658802fb85c5435ca9dc6c72e9505466a40e0e Mon Sep 17 00:00:00 2001 From: Matthew Parkinson Date: Tue, 7 Nov 2023 14:50:20 +0000 Subject: [PATCH 1/3] FreeBSD CI. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4855549fa..cbdbd57a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -133,11 +133,11 @@ jobs: fail-fast: false # Kill these jobs if they take too long. timeout-minutes: 25 - runs-on: macos-latest + runs-on: ubuntu-22.04 name: FreeBSD-${{ matrix.os.version}} ${{ matrix.build-type }} steps: - uses: actions/checkout@v3 - - uses: vmactions/freebsd-vm@v0 + - uses: vmactions/freebsd-vm@v1 with: release: ${{ matrix.os.version}} usesh: true From 6f205d6b6c5a19042ea75a94420c67270658e56d Mon Sep 17 00:00:00 2001 From: Matthew Parkinson Date: Tue, 7 Nov 2023 14:52:31 +0000 Subject: [PATCH 2/3] Remove older versions that aren't supported --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cbdbd57a6..508b74960 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -124,9 +124,7 @@ jobs: # Build each combination of OS, version, and release/debug variants # FreeBSD and OpenBSD run on xhyve, netbsd needs qemu os: - - version: '13.1' - dependencies: pkg ins -y cmake ninja - - version: '12.3' + - version: '13.2' dependencies: pkg ins -y cmake ninja build-type: [ Release, Debug ] # Don't abort runners if a single one fails From 4c801db1bdc9c31dd833d16b55fc76ff52676f48 Mon Sep 17 00:00:00 2001 From: Matthew Parkinson Date: Tue, 7 Nov 2023 17:24:15 +0000 Subject: [PATCH 3/3] Remove Debug on FreeBSD as it was taking too long --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 508b74960..229b0c2d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,7 +159,7 @@ jobs: - version: '9.2' dependencies: | pkg_add cmake ninja-build gcc10 - build-type: [ Release, Debug ] + build-type: [ Release ] # Don't abort runners if a single one fails fail-fast: false # Kill these jobs if they take too long.