Skip to content

Commit e17afd3

Browse files
committed
github/workflows: use cross-platform-actions for freebsd
Since vmactions is basically a bootlooping disaster* with no signs of life from upstream, let's try a different action instead and hope it works better. We don't need to force the latest release channel, so delete that part. Also make the pkg install just one command for simplicity. *: vmactions/freebsd-vm#74
1 parent 9074436 commit e17afd3

File tree

1 file changed

+27
-36
lines changed

1 file changed

+27
-36
lines changed

.github/workflows/build.yml

+27-36
Original file line numberDiff line numberDiff line change
@@ -172,62 +172,53 @@ jobs:
172172
173173
freebsd:
174174
runs-on: macos-12 # until https://github.com/actions/runner/issues/385
175-
timeout-minutes: 20 # randomly bootloops https://github.com/vmactions/freebsd-vm/issues/74
175+
timeout-minutes: 20 # avoid any weirdness with the VM
176176
steps:
177177
- uses: actions/checkout@v3
178178
- name: Test in FreeBSD VM
179-
uses: vmactions/freebsd-vm@v0
179+
uses: cross-platform-actions/action@v0.19.1
180180
with:
181-
mem: 8192
182-
copyback: false
183-
usesh: true
184-
prepare: |
185-
# Update to latest release channel
186-
mkdir -p /usr/local/etc/pkg/repos
187-
echo "FreeBSD: { url: "pkg+http://pkg.freebsd.org/\${ABI}/latest" }" \
188-
> /usr/local/etc/pkg/repos/FreeBSD.conf
189-
pkg update
190-
# Requested in ci/build-freebsd.sh
191-
pkg install -y \
192-
git \
181+
operating_system: freebsd
182+
version: '13.2'
183+
run: |
184+
sudo pkg update
185+
sudo pkg install -y \
186+
alsa-lib \
193187
cmake \
194188
evdev-proto \
195189
ffmpeg \
196-
libplacebo \
197-
libxkbcommon \
198-
libXinerama \
199-
libxpresent \
200-
luajit \
201-
meson \
202-
openal-soft \
203-
pkgconf \
204-
python3 \
205-
sdl2 \
206-
sndio \
207-
vulkan-headers \
208-
wayland-protocols \
209-
#
210-
# Optionally auto-enabled
211-
pkg install -y \
212-
alsa-lib \
190+
gettext \
191+
git \
192+
iconv \
213193
jackit \
214-
libXv \
215194
libarchive \
216195
libbluray \
217196
libcaca \
218197
libcdio-paranoia \
219198
libdvdnav \
199+
libplacebo \
200+
libXinerama \
201+
libxkbcommon \
202+
libxpresent \
203+
libXv \
204+
luajit \
205+
meson \
220206
mujs \
207+
openal-soft \
221208
pipewire \
209+
pkgconf \
222210
pulseaudio \
211+
python3 \
223212
rubberband \
224213
sekrit-twc-zimg \
214+
sdl2 \
215+
sndio \
225216
uchardet \
226217
v4l_compat \
227-
#
228-
run: |
229-
./ci/build-freebsd.sh
230-
meson test -C build
218+
vulkan-headers \
219+
wayland-protocols
220+
./ci/build-freebsd.sh
221+
meson test -C build
231222
232223
msys2:
233224
runs-on: windows-latest

0 commit comments

Comments
 (0)