diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index d40918d7e9..2a90c7c24c 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -92,7 +92,7 @@ jobs: test-renderdiff: name: test-renderdiff - runs-on: ubuntu-22.04-16core + runs-on: ubuntu-22.04-4core steps: - uses: actions/checkout@v4.1.6 @@ -107,11 +107,11 @@ jobs: validate-wgsl-pipeline: name: validate-wgsl-pipeline - runs-on: macos-14-xlarge + runs-on: ubuntu-22.04-4core steps: - uses: actions/checkout@v4.1.6 - name: Run build script - run: ./build.sh -W debug test_filamat + run: source ./build/linux/ci-common.sh && ./build.sh -W debug test_filamat - name: Run test run: ./out/cmake-debug/libs/filamat/test_filamat --gtest_filter=MaterialCompiler.Wgsl* \ No newline at end of file diff --git a/build/linux/ci-common.sh b/build/linux/ci-common.sh index bc3abd0fc2..c03ed4eeee 100755 --- a/build/linux/ci-common.sh +++ b/build/linux/ci-common.sh @@ -30,6 +30,9 @@ if [[ "$GITHUB_WORKFLOW" ]]; then sudo apt-get install clang-$GITHUB_CLANG_VERSION libc++-$GITHUB_CLANG_VERSION-dev libc++abi-$GITHUB_CLANG_VERSION-dev sudo apt-get install mesa-common-dev libxi-dev libxxf86vm-dev + # For dawn + sudo apt-get install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev + sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${GITHUB_CLANG_VERSION} 100 sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${GITHUB_CLANG_VERSION} 100 fi