Skip to content

Commit 8167b01

Browse files
committed
test
Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 7362e43 commit 8167b01

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

.github/workflows/sycl-windows-build.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,19 @@ jobs:
7070
name: Build + LIT
7171
runs-on: [Windows, build-test]
7272
environment: WindowsCILock
73+
defaults:
74+
run:
75+
shell: bash
7376
# TODO use cached checkout
7477
outputs:
7578
build_conclusion: ${{ steps.build.conclusion }}
7679
steps:
7780
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
81+
shell: powershell
7882
with:
7983
arch: amd64
8084
- name: oneAPI setup
85+
shell: powershell
8186
if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
8287
run: |
8388
$batchFilePath = "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
@@ -101,7 +106,8 @@ jobs:
101106
}
102107
}
103108
- name: Set env
104-
run: |
109+
shell: powershell
110+
run: |
105111
git config --system core.longpaths true
106112
git config --global core.autocrlf false
107113
echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -117,22 +123,21 @@ jobs:
117123
- name: Configure
118124
env:
119125
ARGS: ${{ inputs.build_configure_extra_args }}
120-
shell: cmd
121126
# TODO switch to clang-cl and lld when this is fixed https://github.com/oneapi-src/level-zero/issues/83
122127
run: |
123128
mkdir build
124129
fsutil.exe file setCaseSensitiveInfo build enable
125130
mkdir install
126-
IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
127-
IF NOT EXIST D:\github\_work\cache\${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
128-
python.exe src/buildbot/configure.py -o build ^
129-
--ci-defaults %ARGS% ^
130-
--cmake-opt="-DCMAKE_C_COMPILER=${{inputs.compiler}}" ^
131-
--cmake-opt="-DCMAKE_CXX_COMPILER=${{inputs.compiler}}" ^
132-
--cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
133-
--cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" ^
134-
--cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=ccache" ^
135-
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" ^
131+
mkdir -p D:\github\_work\cache
132+
mkdir -p D:\github\_work\cache\${{inputs.build_cache_suffix}}
133+
python.exe src/buildbot/configure.py -o build \
134+
--ci-defaults %ARGS% \
135+
--cmake-opt="-DCMAKE_C_COMPILER=${{inputs.compiler}}" \
136+
--cmake-opt="-DCMAKE_CXX_COMPILER=${{inputs.compiler}}" \
137+
--cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" \
138+
--cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" \
139+
--cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=ccache" \
140+
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
136141
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
137142
- name: Build
138143
id: build
@@ -168,7 +173,6 @@ jobs:
168173
cmake --build build --target check-libdevice
169174
- name: Install
170175
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
171-
shell: bash
172176
# TODO replace utility installation with a single CMake target
173177
run: |
174178
cmake --build build --target deploy-sycl-toolchain
@@ -183,7 +187,6 @@ jobs:
183187
cmake --build build --target install-compiler-rt
184188
- name: Pack toolchain
185189
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
186-
shell: bash
187190
run: |
188191
tar -czf ${{ inputs.artifact_archive_name }} -C install .
189192
- name: Upload toolchain

0 commit comments

Comments
 (0)