diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2022-11-09 12:03:37 +0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-11-09 14:00:40 +0000 |
| commit | 81b4af28494c065c5646e3f61a72afd829d978c6 (patch) | |
| tree | 94671b68ac4021589ffff3956f9faac8710052d5 /.github/workflows | |
| parent | 4d058a7034c24594637de72563456ce7882b9bc8 (diff) | |
| download | mesa-81b4af28494c065c5646e3f61a72afd829d978c6.tar.gz mesa-81b4af28494c065c5646e3f61a72afd829d978c6.tar.bz2 mesa-81b4af28494c065c5646e3f61a72afd829d978c6.zip | |
ci: Fixes macos.yml
Stick to macos-11 to prevent accident broken
always install meson with pip to prevent pull new version of python
Cc: mesa-stable
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19615>
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/macos.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8168247fd40..5db4ee82ec1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,9 +9,10 @@ jobs: strategy: matrix: glx_option: ['dri', 'xlib'] - runs-on: macos-latest + runs-on: macos-11 env: GALLIUM_DUMP_CPU: true + MESON_EXEC: /Users/runner/Library/Python/3.11/bin/meson steps: - name: Checkout uses: actions/checkout@v3 @@ -25,28 +26,28 @@ jobs: brew "libxcb" brew "libxdamage" brew "libxext" - brew "meson" + brew "ninja" brew "pkg-config" brew "python@3.10" EOL brew update brew bundle --verbose - - name: Install Mako - run: pip3 install --user mako + - name: Install Mako and meson + run: pip3 install --user mako meson - name: Configure run: | cat > native_config <<EOL [binaries] llvm-config = '/usr/local/opt/llvm/bin/llvm-config' EOL - meson . build --native-file=native_config -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast -Dglx=${{ matrix.glx_option }} + $MESON_EXEC . build --native-file=native_config -Dbuild-tests=true -Dosmesa=true -Dgallium-drivers=swrast -Dglx=${{ matrix.glx_option }} - name: Build - run: meson compile -C build + run: $MESON_EXEC compile -C build - name: Test - run: meson test -C build --print-errorlogs + run: $MESON_EXEC test -C build --print-errorlogs - name: Install - run: meson install -C build --destdir $PWD/install + run: $MESON_EXEC install -C build --destdir $PWD/install - name: 'Upload Artifact' if: always() uses: actions/upload-artifact@v3 |