Skip to content

Commit b5ae045

Browse files
committed
fix ci.
1 parent 4d415f6 commit b5ae045

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

.github/workflows/ci.yml

+15-4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
- { config: release, test-category: full }
4848
# default not full gpu tests
4949
- full-gpu-tests: false
50+
- build-llvm: true
51+
- {os: windows, platform: aarch64, build-llvm: false }
52+
- {os: linux, platform: aarch64, build-llvm: false }
53+
- {platform: wasm, build-llvm: false }
5054
# The runners don't have a GPU by default except for the self-hosted ones
5155
- has-gpu: false
5256
# Self-hosted aarch64 build
@@ -56,8 +60,9 @@ jobs:
5660
platform: aarch64
5761
test-category: smoke
5862
full-gpu-tests: false
59-
runs-on: [self-hosted, Linux, ARM64]
60-
has-gpu: true
63+
runs-on: ubuntu-22.04-arm
64+
has-gpu: false
65+
build-llvm: false
6166
# Self-hosted full gpu build
6267
- os: windows
6368
config: release
@@ -110,7 +115,7 @@ jobs:
110115
compiler: ${{matrix.compiler}}
111116
platform: ${{matrix.platform}}
112117
config: ${{matrix.config}}
113-
build-llvm: ${{ matrix.platform != 'wasm' }}
118+
build-llvm: ${{ matrix.build-llvm }}
114119
- name: Build Slang
115120
if: steps.filter.outputs.should-run == 'true'
116121
run: |
@@ -140,6 +145,12 @@ jobs:
140145
"-DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-llvm.zip" \
141146
"-DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}}"
142147
cmake --workflow --preset "${{matrix.config}}"
148+
elif [[ "${{ matrix.build-llvm }}" = "false" ]]; then
149+
# linux aarch64 cannot build llvm.
150+
cmake --preset default --fresh \
151+
-DSLANG_SLANG_LLVM_FLAVOR=DISABLE \
152+
-DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}}
153+
cmake --workflow --preset "${{matrix.config}}"
143154
else
144155
# Otherwise, use the "system" llvm we have just build or got from the
145156
# cache in the setup phase
@@ -150,7 +161,7 @@ jobs:
150161
fi
151162
fi
152163
- name: Test Slang
153-
if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm'
164+
if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.platform != 'aarch64'
154165
run: |
155166
export SLANG_RUN_SPIRV_VALIDATION=1
156167
export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1

.github/workflows/release.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ jobs:
2424
platform: [x86_64, aarch64]
2525
test-category: [smoke]
2626
include:
27-
- { os: linux, runs-on: ubuntu-20.04, compiler: gcc }
27+
- { os: linux, platform:x86_64, runs-on: ubuntu-22.04, compiler: gcc }
28+
- { os: linux, platform:aarch64, runs-on: ubuntu-22.04-arm, compiler: gcc }
2829
- { os: windows, runs-on: windows-latest, compiler: cl }
2930
- { os: macos, runs-on: macos-latest, compiler: clang }
3031

0 commit comments

Comments
 (0)