Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 3 additions & 2 deletions .github/workflows/sycl-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,11 @@
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build \
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/toolchain \
-t Release \
--ci-defaults --use-zstd ${{ inputs.build_configure_extra_args }} \
--ci-defaults --use-zstd \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DLLVM_INSTALL_UTILS=ON
-DLLVM_INSTALL_UTILS=ON \
${{ inputs.build_configure_extra_args }}
- name: Compile
id: build
# Emulate default value for manual dispatch as we've run out of available arguments.
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/sycl-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ jobs:
secrets: inherit
with:
build_cache_root: "/__w/"
build_configure_extra_args: '--hip --cuda'
build_configure_extra_args: |
--hip --cuda \
-DLLVM_VC_REPOSITORY="${{ github.repositoryUrl }}" -DLLVM_VC_REVISION="${{ github.sha }} Nightly build" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we're only doing this for the nightly, is there some benefit we get to knowing if someone is using the nightly or not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll also add the same thing for nightly release builds like x.y.z pre-release build and x.y.z release build for official releases, so this is needed to distinguish them.

-DCLANG_VC_REPOSITORY="${{ github.repositoryUrl }}" -DCLANG_VC_REVISION="${{ github.sha }} Nightly build"
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest

retention-days: 90
Expand Down Expand Up @@ -191,7 +194,10 @@ jobs:
# functionality, make sure Linux/Windows names follow the same pattern.
toolchain_artifact_filename: sycl_windows.tar.gz
# Disable the spirv-dis requirement as to not require SPIR-V Tools.
build_configure_extra_args: -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off
build_configure_extra_args: |
-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off ^
-DLLVM_VC_REPOSITORY="${{ github.repositoryUrl }}" -DLLVM_VC_REVISION="${{ github.sha }} Nightly build" ^
-DCLANG_VC_REPOSITORY="${{ github.repositoryUrl }}" -DCLANG_VC_REVISION="${{ github.sha }} Nightly build"
build_target: all

e2e-win:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/sycl-windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,14 @@ jobs:
IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
IF NOT EXIST D:\github\_work\cache\${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
python.exe src/buildbot/configure.py -o build ^
--ci-defaults --use-zstd %ARGS% ^
--ci-defaults --use-zstd ^
"-DCMAKE_C_COMPILER=${{inputs.cxx}}" ^
"-DCMAKE_CXX_COMPILER=${{inputs.cxx}}" ^
"-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache ^
-DCMAKE_C_COMPILER_LAUNCHER=ccache ^
-DLLVM_INSTALL_UTILS=ON
-DLLVM_INSTALL_UTILS=ON ^
%ARGS%
- name: Build
id: build
shell: bash
Expand Down
Loading