diff options
| author | Yong He <yonghe@outlook.com> | 2025-02-27 21:06:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-27 21:06:15 -0800 |
| commit | 9fd3e7c150ed9723c153948312a226345f3b8633 (patch) | |
| tree | 40f1e460a2452a9e5a1b889c4f7de48e01b93383 /.github/workflows/ci.yml | |
| parent | 4d415f6af2266cc38798d72f6816c60b91a5003c (diff) | |
Fix CI settings. (#6491)
* fix ci.
* fix.
* format code
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to '.github/workflows/ci.yml')
| -rw-r--r-- | .github/workflows/ci.yml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fc7be677..66d33bc08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,8 @@ jobs: - { config: release, test-category: full } # default not full gpu tests - full-gpu-tests: false + - build-llvm: true + - { platform: wasm, build-llvm: false } # The runners don't have a GPU by default except for the self-hosted ones - has-gpu: false # Self-hosted aarch64 build @@ -56,8 +58,9 @@ jobs: platform: aarch64 test-category: smoke full-gpu-tests: false - runs-on: [self-hosted, Linux, ARM64] - has-gpu: true + runs-on: ubuntu-22.04-arm + has-gpu: false + build-llvm: false # Self-hosted full gpu build - os: windows config: release @@ -110,7 +113,7 @@ jobs: compiler: ${{matrix.compiler}} platform: ${{matrix.platform}} config: ${{matrix.config}} - build-llvm: ${{ matrix.platform != 'wasm' }} + build-llvm: ${{ matrix.build-llvm }} - name: Build Slang if: steps.filter.outputs.should-run == 'true' run: | @@ -140,6 +143,12 @@ jobs: "-DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-llvm.zip" \ "-DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}}" cmake --workflow --preset "${{matrix.config}}" + elif [[ "${{ matrix.build-llvm }}" = "false" ]]; then + # linux aarch64 cannot build llvm. + cmake --preset default --fresh \ + -DSLANG_SLANG_LLVM_FLAVOR=DISABLE \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} + cmake --workflow --preset "${{matrix.config}}" else # Otherwise, use the "system" llvm we have just build or got from the # cache in the setup phase @@ -150,7 +159,7 @@ jobs: fi fi - name: Test Slang - if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' + if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.platform != 'aarch64' run: | export SLANG_RUN_SPIRV_VALIDATION=1 export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1 |