diff options
| -rw-r--r-- | .github/workflows/ci.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 8 |
2 files changed, 20 insertions, 5 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e6e9a5a8d..637ca3211 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,13 @@ jobs: platform: [x86_64, aarch64] test-category: [smoke] include: - - { os: linux, runs-on: ubuntu-20.04, compiler: gcc } + - { os: linux, platform:x86_64, runs-on: ubuntu-22.04, compiler: gcc } + - { + os: linux, + platform:aarch64, + runs-on: ubuntu-22.04-arm, + compiler: gcc, + } - { os: windows, runs-on: windows-latest, compiler: cl } - { os: macos, runs-on: macos-latest, compiler: clang } |