diff --git a/.github/workflows/build-mesa.yml b/.github/workflows/build-mesa.yml index 00222cf1..91532408 100644 --- a/.github/workflows/build-mesa.yml +++ b/.github/workflows/build-mesa.yml @@ -59,7 +59,7 @@ jobs: if [ "$RUNNER_OS" == "Windows" ]; then ninja install else - sudo ninja install + sudo $(which ninja) install fi - name: Fetch Mesa run: | @@ -82,11 +82,11 @@ jobs: source venv/bin/activate fi pip list - if [ "$RUNNER_OS" == "macOS" ]; then - ls -l /opt/homebrew/opt/llvm/bin - export PATH="/opt/homebrew/opt/llvm/bin:$PATH" - export AR=/opt/homebrew/opt/llvm/bin/llvm-ar - fi + #if [ "$RUNNER_OS" == "macOS" ]; then + # ls -l /opt/homebrew/opt/llvm/bin + # export PATH="/opt/homebrew/opt/llvm/bin:$PATH" + # export AR=/opt/homebrew/opt/llvm/bin/llvm-ar + #fi cd mesa meson setup -Dvulkan-drivers=swrast -Dintel-clc=system -Dopengl=false -Dgles1=false -Dgles2=false -Dgallium-drivers=llvmpipe -Dplatforms=${{ env.platforms }} build # FIXME separate configure step necessary because using bash selects GNU link.exe