diff options
| author | noasakurajin <dev@noasakurajin.de> | 2022-11-04 16:39:10 +0000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-11-22 19:04:13 +0000 |
| commit | 8b8d14f9066560d305b8df8244b57f11cd2697e7 (patch) | |
| tree | da4ce03692097a6e3d304b9769795e08046489dc /.github | |
| parent | e244b0f8b20a136182cfbd9f4360d90882c14799 (diff) | |
| download | mesa-8b8d14f9066560d305b8df8244b57f11cd2697e7.tar.gz | |
add zink to macos ci
This commit causes zink to be build in the macos ci on every commit.
In addition to that meson will now error if there is no moltenvk-dir
given on macos since the build would fail anyways.
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19531>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macos.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5db4ee82ec1..d1b66ef4cad 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -26,6 +26,7 @@ jobs: brew "libxcb" brew "libxdamage" brew "libxext" + brew "molten-vk" brew "ninja" brew "pkg-config" brew "python@3.10" @@ -41,7 +42,7 @@ jobs: [binaries] llvm-config = '/usr/local/opt/llvm/bin/llvm-config' EOL - $MESON_EXEC . build --native-file=native_config -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast -Dglx=${{ matrix.glx_option }} + $MESON_EXEC . build --native-file=native_config -Dmoltenvk-dir=$(brew --prefix molten-vk) -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast,zink -Dglx=${{ matrix.glx_option }} - name: Build run: $MESON_EXEC compile -C build - name: Test |