diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml index 11557dd5e2c5f..2bfb0108e9bb1 100644 --- a/.github/workflows/sycl_post_commit.yml +++ b/.github/workflows/sycl_post_commit.yml @@ -93,3 +93,7 @@ jobs: with: name: sycl_linux_${{ matrix.config }} path: llvm_sycl.tar.gz + + windows_default: + name: Windows + using: ./.github/workflows/sycl_windows_build_and_test.yml diff --git a/.github/workflows/sycl_windows_build_and_test.yml b/.github/workflows/sycl_windows_build_and_test.yml index 4e798d4677cb0..73876b3c01d95 100644 --- a/.github/workflows/sycl_windows_build_and_test.yml +++ b/.github/workflows/sycl_windows_build_and_test.yml @@ -15,12 +15,9 @@ jobs: - name: Install dependencies shell: cmd run: | - choco install -y cuda --version 11.6.0.51123 choco install -y ninja choco install -y sccache --version 0.2.15 refreshenv - echo CUDA_PATH=%CUDA_PATH% - echo CUDA_PATH=%CUDA_PATH% >> %GITHUB_ENV% - uses: ilammy/msvc-dev-cmd@9f8ae839b01883414208f29e3e24524387f48e1f with: arch: amd64 @@ -35,9 +32,6 @@ jobs: sycl-win-build- - name: Build shell: cmd - env: - CUDA_PATH: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' - CUDA_TOOLKIT_ROOT_DIR: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' # TODO switch to clang-cl and lld when this is fixed https://github.com/oneapi-src/level-zero/issues/83 # TODO enable sccache, when problems with PDB are resolved run: | @@ -51,8 +45,7 @@ jobs: --cmake-opt="-DCMAKE_CXX_COMPILER=cl" ^ --cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^ --cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" ^ - --cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache" ^ - --cuda + --cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache" cmake --build build --target sycl-toolchain sccache --show-stats - name: Install