diff --git a/.github/sycl-build-deps.env b/.github/sycl-build-deps.env index 09ee8362a1..fb0ab0ea63 100644 --- a/.github/sycl-build-deps.env +++ b/.github/sycl-build-deps.env @@ -1,8 +1,8 @@ # Open source SYCL build deps, loaded by os-llvm-sycl-build.yml and bumped by # bump-sycl-deps.yml from intel/llvm devops/dependencies.json. # Kept out of .github/workflows/ since GITHUB_TOKEN can't push workflow files. -DRIVER_PATH=2026-WW42 -OCLCPUEXP_FN=oclcpuexp-2026.23.10.0.02_160000_rel.tar.gz -TBB_URL=https://github.com/uxlfoundation/oneTBB/releases/download/v2023.2.0/ -TBB_INSTALL_DIR=oneapi-tbb-2023.2.0 -TBB_FN=oneapi-tbb-2023.2.0-lin.tgz +DRIVER_PATH=2026-WW28 +OCLCPUEXP_FN=oclcpuexp-2026.22.6.1.17_160000_rel.tar.gz +TBB_URL=https://github.com/uxlfoundation/oneTBB/releases/download/v2023.1.0/ +TBB_INSTALL_DIR=oneapi-tbb-2023.1.0 +TBB_FN=oneapi-tbb-2023.1.0-lin.tgz diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index 0e3bb09444..90c40afb91 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -128,19 +128,23 @@ jobs: fi # pinned deps are fetched independently of the nightly, so a pin - # change replaces whatever the cache restored + # change replaces whatever the cache restored; the oclcpuexp + # tarball extracts read-only directories, so restore write access + # before removing them if [ ! -f "${OCLCPUEXP_FN}" ]; then - rm -rf oclcpuexp oclcpuexp-*.tar.gz + chmod -R u+w oclcpuexp 2>/dev/null + rm -rf oclcpuexp oclcpuexp-*.tar.gz || exit 1 wget "${DOWNLOAD_URL_PREFIX}/${DRIVER_PATH}/${OCLCPUEXP_FN}" || exit 1 fi if [ ! -f "${TBB_FN}" ]; then - rm -rf oneapi-tbb-* + chmod -R u+w oneapi-tbb-* 2>/dev/null + rm -rf oneapi-tbb-* || exit 1 wget "${TBB_URL}/${TBB_FN}" || exit 1 fi mkdir -p oclcpuexp - [ -d oclcpuexp/x64 ] || tar xf "${OCLCPUEXP_FN}" -C oclcpuexp - [ -d "${TBB_INSTALL_DIR}/lib" ] || tar xf "${TBB_FN}" - cp oclcpuexp/x64/libOpenCL.so* dpcpp_compiler/lib/ + [ -d oclcpuexp/x64 ] || tar xf "${OCLCPUEXP_FN}" -C oclcpuexp || exit 1 + [ -d "${TBB_INSTALL_DIR}/lib" ] || tar xf "${TBB_FN}" || exit 1 + cp -f oclcpuexp/x64/libOpenCL.so* dpcpp_compiler/lib/ || exit 1 - name: Setup Python uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0