Merge branch 'master' into multiplayer-next

This commit is contained in:
foxtacles 2026-04-04 08:38:19 -07:00 committed by GitHub
commit 09d8360370
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -279,6 +279,35 @@ jobs:
build/dist/*.apk build/dist/*.apk
build/dist/*.vpk build/dist/*.vpk
freebsd:
name: 'FreeBSD'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build on FreeBSD
uses: vmactions/freebsd-vm@v1
with:
release: "15.0"
usesh: true
prepare: |
pkg install -y cmake ninja qt6-base git xorg alsa-lib
run: |
cmake -S . -B build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DISLE_USE_DX5=false \
-DISLE_BUILD_CONFIG=true \
-DISLE_WERROR=true \
-Werror=dev
cmake --build build --verbose --config Release
cd build && cpack .
- name: Upload Build Artifacts
uses: actions/upload-artifact@v4
with:
name: 'FreeBSD'
path: build/dist/isle-*
flatpak: flatpak:
name: "Flatpak (${{ matrix.arch }})" name: "Flatpak (${{ matrix.arch }})"
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -353,6 +382,7 @@ jobs:
needs: needs:
- build - build
- flatpak - flatpak
- freebsd
steps: steps:
- name: Download All Artifacts - name: Download All Artifacts
uses: actions/download-artifact@main uses: actions/download-artifact@main