Skip to content

Commit f87d073

Browse files
author
Pavel V Chupin
committed
Fix issues
1 parent 2b22b75 commit f87d073

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

.github/workflows/sycl_windows_build_and_test.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,20 @@ jobs:
7070
--cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache"
7171
- name: Build
7272
id: build
73+
# TODO replace utility installation with a single CMake target
7374
run: |
74-
cmake --build build --target sycl-toolchain
75+
cmake --build build --target deploy-sycl-toolchain
76+
cmake --build build --target utils/FileCheck/install
77+
cmake --build build --target utils/count/install
78+
cmake --build build --target utils/not/install
79+
cmake --build build --target utils/lit/install
80+
cmake --build build --target utils/llvm-lit/install
81+
cmake --build build --target install-clang-format
82+
cmake --build build --target install-clang-tidy
83+
cmake --build build --target install-llvm-size
84+
cmake --build build --target install-llvm-cov
85+
cmake --build build --target install-llvm-profdata
86+
cmake --build build --target install-compiler-rt
7587
sccache --show-stats
7688
# - name: check-llvm
7789
# shell: bash

devops/actions/llvm_test_suite_win/action.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ runs:
3636
uses: actions/download-artifact@v3
3737
with:
3838
name: ${{ inputs.sycl_artifact }}
39+
path: install
3940
- name: Download LIT
4041
uses: actions/download-artifact@v3
4142
with:
4243
name: ${{ inputs.lit_artifact }}
44+
path: lit
4345
- name: Configure
4446
shell: cmd
4547
run: |
@@ -53,13 +55,14 @@ runs:
5355
shell: cmd
5456
run: |
5557
set PATH=%GITHUB_WORKSPACE%\install\bin;%PATH%
56-
# TODO make this part of container build
57-
set LIT_OPTS="-v --no-progress-bar --show-unsupported --max-time 3600 --time-tests -o %GITHUB_WORKSPACE%\build\results_${{ inputs.results_name_suffix }}.json"
58+
set LIT_OPTS=-v --no-progress-bar --show-unsupported --max-time 3600 --time-tests -o results_${{ inputs.results_name_suffix }}.json
5859
echo ::group::sycl-ls --verbose
5960
sycl-ls --verbose
6061
echo ::endgroup::
6162
echo ::group::SYCL_PI_TRACE=-1 sycl-ls
62-
SYCL_PI_TRACE=-1 sycl-ls
63+
set SYCL_PI_TRACE=-1
64+
sycl-ls
65+
set SYCL_PI_TRACE=
6366
echo ::endgroup::
6467
cd build
6568
ninja check-sycl-all
@@ -73,11 +76,7 @@ runs:
7376
shell: cmd
7477
if: always()
7578
run: |
76-
del /q install
77-
rmdir install
78-
del /q lit
79-
rmdir lit
80-
del /q build
81-
rmdir build
82-
del /q llvm_test_suite
83-
rmdir llvm_test_suite
79+
rmdir /q /s install
80+
rmdir /q /s lit
81+
rmdir /q /s build
82+
rmdir /q /s llvm_test_suite

0 commit comments

Comments
 (0)