Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI settings. #6491

Merged
merged 4 commits into from
Feb 28, 2025
Merged

Fix CI settings. #6491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ae045
fix ci.
csyonghe Feb 28, 2025
e73137c
fix.
csyonghe Feb 28, 2025
0148539
format code
slangbot Feb 28, 2025
1946b2d
Merge pull request #17 from slangbot/format-6491-ci-fix
csyonghe Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
Loading