From 6f86b196da490b0508599da62404d479f8a3dd67 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 30 Mar 2024 22:50:23 +0000 Subject: [PATCH] ci: use Linux runner for BSDs, add arm64 FreeBSD 14 job - bump cross-platform-actions to 0.23.0. Ref: https://github.com/cross-platform-actions/action/releases/tag/v0.23.0 - switch to Linux runners (from macOS) for cross-platform-actions. It's significantly faster. - switch back FreeBSD 14 job to cross-platform-actions. Also switch back to default shell. - add FreeBSD 14 arm64 job. Closes #1343 --- .github/workflows/ci.yml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2aaf2e8..0f3641f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -541,12 +541,12 @@ jobs: build_netbsd: name: 'NetBSD (cmake, openssl, clang, amd64)' - runs-on: macos-12 + runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v4 - name: 'cmake' - uses: cross-platform-actions/action@v0.21.1 + uses: cross-platform-actions/action@v0.23.0 with: operating_system: 'netbsd' version: '9.3' @@ -565,12 +565,12 @@ jobs: build_openbsd: name: 'OpenBSD (cmake, libressl, clang, amd64)' - runs-on: macos-12 + runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v4 - name: 'cmake' - uses: cross-platform-actions/action@v0.21.1 + uses: cross-platform-actions/action@v0.23.0 with: operating_system: 'openbsd' version: '7.4' @@ -588,18 +588,26 @@ jobs: cmake --build bld --parallel 3 build_freebsd: - name: 'FreeBSD (autotools, openssl, clang, amd64)' - runs-on: ubuntu-22.04 + name: 'FreeBSD (autotools, openssl, clang)' + runs-on: ubuntu-latest timeout-minutes: 30 + env: + CC: clang + strategy: + matrix: + arch: [x86-64, arm64] steps: - uses: actions/checkout@v4 - name: 'autotools' - uses: vmactions/freebsd-vm@v1 + uses: cross-platform-actions/action@v0.23.0 with: - # https://ports.freebsd.org/ - prepare: pkg install -y autoconf automake libtool bash + operating_system: 'freebsd' + version: '14.0' + architecture: ${{ matrix.arch }} + environment_variables: 'CC' run: | - setenv CC clang + # https://ports.freebsd.org/ + sudo pkg install -y autoconf automake libtool autoreconf -fi mkdir bld && cd bld && ../configure --enable-werror --enable-debug \ --with-crypto=openssl \