Skip to content

Commit 9fd3e7c

Browse files
csyongheslangbot
andauthored
Fix CI settings. (#6491)
* fix ci. * fix. * format code --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
1 parent 4d415f6 commit 9fd3e7c

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

.github/workflows/ci.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ jobs:
4747
- { config: release, test-category: full }
4848
# default not full gpu tests
4949
- full-gpu-tests: false
50+
- build-llvm: true
51+
- { platform: wasm, build-llvm: false }
5052
# The runners don't have a GPU by default except for the self-hosted ones
5153
- has-gpu: false
5254
# Self-hosted aarch64 build
@@ -56,8 +58,9 @@ jobs:
5658
platform: aarch64
5759
test-category: smoke
5860
full-gpu-tests: false
59-
runs-on: [self-hosted, Linux, ARM64]
60-
has-gpu: true
61+
runs-on: ubuntu-22.04-arm
62+
has-gpu: false
63+
build-llvm: false
6164
# Self-hosted full gpu build
6265
- os: windows
6366
config: release
@@ -110,7 +113,7 @@ jobs:
110113
compiler: ${{matrix.compiler}}
111114
platform: ${{matrix.platform}}
112115
config: ${{matrix.config}}
113-
build-llvm: ${{ matrix.platform != 'wasm' }}
116+
build-llvm: ${{ matrix.build-llvm }}
114117
- name: Build Slang
115118
if: steps.filter.outputs.should-run == 'true'
116119
run: |
@@ -140,6 +143,12 @@ jobs:
140143
"-DSLANG_SLANG_LLVM_BINARY_URL=$(pwd)/build/dist-release/slang-llvm.zip" \
141144
"-DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}}"
142145
cmake --workflow --preset "${{matrix.config}}"
146+
elif [[ "${{ matrix.build-llvm }}" = "false" ]]; then
147+
# linux aarch64 cannot build llvm.
148+
cmake --preset default --fresh \
149+
-DSLANG_SLANG_LLVM_FLAVOR=DISABLE \
150+
-DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}}
151+
cmake --workflow --preset "${{matrix.config}}"
143152
else
144153
# Otherwise, use the "system" llvm we have just build or got from the
145154
# cache in the setup phase
@@ -150,7 +159,7 @@ jobs:
150159
fi
151160
fi
152161
- name: Test Slang
153-
if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm'
162+
if: steps.filter.outputs.should-run == 'true' && matrix.platform != 'wasm' && matrix.platform != 'aarch64'
154163
run: |
155164
export SLANG_RUN_SPIRV_VALIDATION=1
156165
export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1

.github/workflows/release.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ 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+
- {
29+
os: linux,
30+
platform:aarch64,
31+
runs-on: ubuntu-22.04-arm,
32+
compiler: gcc,
33+
}
2834
- { os: windows, runs-on: windows-latest, compiler: cl }
2935
- { os: macos, runs-on: macos-latest, compiler: clang }
3036

0 commit comments

Comments
 (0)