diff --git a/.github/workflows/continuous-build-freebsd.yml b/.github/workflows/continuous-build-freebsd.yml index 4cdc55082..27e364f1a 100644 --- a/.github/workflows/continuous-build-freebsd.yml +++ b/.github/workflows/continuous-build-freebsd.yml @@ -27,25 +27,28 @@ on: jobs: build-freebsd: - runs-on: macos-12 + runs-on: ubuntu-22.04 timeout-minutes: 20 + strategy: + matrix: + compiler: ["clang++", "g++"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Compile - uses: vmactions/freebsd-vm@v0 + uses: vmactions/freebsd-vm@v1 with: - release: 13.2 + release: '14.0' usesh: true prepare: | - pkg install -y gmake gcc11 coreutils git + pkg install -y gmake gcc13 coreutils git git config --global --add safe.directory /Users/runner/work/btop/btop run: | - gmake STATIC=true STRIP=true + CXX=${{ matrix.compiler }} gmake STATIC=true STRIP=true GIT_HASH=$(git rev-parse --short "$GITHUB_SHA") - mv bin/btop bin/btop-$GIT_HASH + mv bin/btop bin/btop-"${{ matrix.compiler }}"-$GIT_HASH ls -alh bin - uses: actions/upload-artifact@v3 @@ -53,3 +56,19 @@ jobs: name: btop-x86_64-FreeBSD-13.2 path: 'bin/*' if-no-files-found: error + + build-freebsd-cmake: + runs-on: ubuntu-22.04 + timeout-minutes: 20 + steps: + - uses: actions/checkout@v4 + + - name: Compile + uses: vmactions/freebsd-vm@v1 + with: + release: '14.0' + usesh: true + prepare: pkg install -y cmake git ninja + run: | + CXX=clang++ cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DBTOP_STATIC=ON + cmake --build build