From 609c4d1aded4fdeb4f8b6188a2fb1bd6f687ca3c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 17 Aug 2023 08:34:20 +0200 Subject: [PATCH 1/3] .github: make pipeline fail if build-openbsd fails This PR makes the pipeline fail if the build-openbsd job fails. While were at it, also update the cross-actions to the latest version 0.19.0. --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5dc215463..bcbaaf65f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -92,8 +92,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: "cross-platform-actions/action@v0.15.0" - continue-on-error: true + - uses: "cross-platform-actions/action@v0.19.0" with: operating_system: openbsd architecture: x86-64 From 3ff172f9f7252184069a9251e40ccb35186d26b9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 17 Aug 2023 08:45:56 +0200 Subject: [PATCH 2/3] .github: build-openbsd runs on arm64 too --- .github/workflows/ci.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bcbaaf65f..652a5dfd3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -90,12 +90,17 @@ jobs: build-openbsd: runs-on: ubuntu-latest + strategy: + matrix: + arch: + - x86_64 + - arm64 steps: - uses: actions/checkout@v3 - uses: "cross-platform-actions/action@v0.19.0" with: operating_system: openbsd - architecture: x86-64 + architecture: ${{ matrix.arch }} version: 7.2 run: | sudo pkg_add git meson squashfs-tools curl lz4 xz zstd From 2f98ba137232976c66eed8f603b691eb2394fb48 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 17 Aug 2023 09:30:11 +0200 Subject: [PATCH 3/3] .github: only run cross targets on main --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 652a5dfd3..6f0a41200 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -90,6 +90,7 @@ jobs: build-openbsd: runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/main' }} strategy: matrix: arch: