diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-10-23 10:48:47 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-10-23 19:23:48 +0000 |
| commit | 71a497deee8f5cb47a9ea37bc14038ecdf238e21 (patch) | |
| tree | 1b6589a695bbf3c77db460c63742e1f4825b5178 /.github | |
| parent | 7d63b81cf14c4b53430695addd034eba4c825f89 (diff) | |
| download | mpv-71a497deee8f5cb47a9ea37bc14038ecdf238e21.tar.bz2 mpv-71a497deee8f5cb47a9ea37bc14038ecdf238e21.tar.xz | |
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.
*: https://github.com/vmactions/freebsd-vm/issues/74
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 62 |
1 files changed, 26 insertions, 36 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34bf770a72..f032d443b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -172,62 +172,52 @@ jobs: freebsd: runs-on: macos-12 # until https://github.com/actions/runner/issues/385 - timeout-minutes: 20 # randomly bootloops https://github.com/vmactions/freebsd-vm/issues/74 + timeout-minutes: 20 # avoid any weirdness with the VM steps: - uses: actions/checkout@v3 - name: Test in FreeBSD VM - uses: vmactions/freebsd-vm@v0 + uses: cross-platform-actions/action@v0.19.1 with: - mem: 8192 - copyback: false - usesh: true - prepare: | - # Update to latest release channel - mkdir -p /usr/local/etc/pkg/repos - echo "FreeBSD: { url: "pkg+http://pkg.freebsd.org/\${ABI}/latest" }" \ - > /usr/local/etc/pkg/repos/FreeBSD.conf - pkg update - # Requested in ci/build-freebsd.sh - pkg install -y \ - git \ + operating_system: freebsd + version: '13.2' + run: | + sudo pkg update + sudo pkg install -y \ + alsa-lib \ cmake \ evdev-proto \ ffmpeg \ - libplacebo \ - libxkbcommon \ - libXinerama \ - libxpresent \ - luajit \ - meson \ - openal-soft \ - pkgconf \ - python3 \ - sdl2 \ - sndio \ - vulkan-headers \ - wayland-protocols \ - # - # Optionally auto-enabled - pkg install -y \ - alsa-lib \ + git \ + iconv \ jackit \ - libXv \ libarchive \ libbluray \ libcaca \ libcdio-paranoia \ libdvdnav \ + libplacebo \ + libXinerama \ + libxkbcommon \ + libxpresent \ + libXv \ + luajit \ + meson \ mujs \ + openal-soft \ pipewire \ + pkgconf \ pulseaudio \ + python3 \ rubberband \ sekrit-twc-zimg \ + sdl2 \ + sndio \ uchardet \ v4l_compat \ - # - run: | - ./ci/build-freebsd.sh - meson test -C build + vulkan-headers \ + wayland-protocols + ./ci/build-freebsd.sh + meson test -C build msys2: runs-on: windows-latest |