diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-02-26 13:05:49 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-03-02 15:45:27 +0000 |
| commit | e82d9045a4625076fafafa6c4f76b35101a3adca (patch) | |
| tree | e4ccfcac8c4820d7182d55ce3630f28bf9267bfd /ci/build-macos.sh | |
| parent | 9db818279aa63d071f2bca369235285314444dcd (diff) | |
| download | mpv-e82d9045a4625076fafafa6c4f76b35101a3adca.tar.bz2 mpv-e82d9045a4625076fafafa6c4f76b35101a3adca.tar.xz | |
ci: separate meson tests and reorganize build steps
Instead of running the test directly in the build script, we can make a
separate step in the workflow so it looks a little prettier. For running
the actual tests, we skip mingw since they will never be run (cross
compiled). Additionally, improve the github workflow logic a bit so that
way logs on failure are only shown when that specific step fails. The
freebsd job still has to be less elegant since it's in a weird vm
thingy.
Not really related but the location of various build directories
(particularly waf) are corrected as well (might as well).
Diffstat (limited to 'ci/build-macos.sh')
| -rwxr-xr-x | ci/build-macos.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/build-macos.sh b/ci/build-macos.sh index 00124107a0..3b3255b8a6 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -14,13 +14,11 @@ if [[ $1 = "meson" ]]; then PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \ meson setup build \ -Dprefix="${MPV_INSTALL_PREFIX}" \ - -Dlibmpv=true \ + -D{libmpv,tests}=true \ -D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \ -D{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl}=enabled meson compile -C build -j4 - meson test -C build - meson install -C build ./build/mpv -v --no-config fi |