Skip to content

Commit ba822f4

Browse files
committed
Bump CTS version used on CI to latest
Also bump the OpenCL headers and ICD loader versions.
1 parent ffc899c commit ba822f4

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,10 @@ jobs:
190190
runs-on: ubuntu-22.04
191191
needs: [build]
192192
env:
193-
cts_hash: 92285f7c9de965ddc41e7dfaaab8c7c75aa55dbe
194-
headers_hash: 5e2f8c66476bcf60eb8c2921807e34efb30294ee
195-
loader_hash: 4aa683775c4ee55594196c79def7a75103d75e4c
193+
cts_hash: 5673883005aad3f8bec6fa64e1bfb663e85ee1af
194+
headers_hash: 6c4028a1ded61881ede75c0d6b3247436a423d78
195+
loader_hash: b1c57534df7ac82519b04606f51b71fb5d4053c3
196+
spirv_headers_hash: f88a2d766840fc825af1fc065977953ba1fa4a91
196197
steps:
197198
- uses: actions/checkout@v2
198199
- uses: actions/cache@v4
@@ -215,6 +216,12 @@ jobs:
215216
repository: KhronosGroup/OpenCL-Headers
216217
path: opencl-cts/opencl-headers
217218
ref: ${{ env.headers_hash }}
219+
- uses: actions/checkout@v2
220+
if: steps.cache-cts.outputs.cache-hit != 'true'
221+
with:
222+
repository: KhronosGroup/SPIRV-Headers
223+
path: opencl-cts/spirv-headers
224+
ref: ${{ env.spirv_headers_hash }}
218225
- uses: actions/checkout@v2
219226
if: steps.cache-cts.outputs.cache-hit != 'true'
220227
with:
@@ -246,7 +253,7 @@ jobs:
246253
-DCMAKE_INSTALL_PREFIX=$PWD/../install \
247254
-DCL_INCLUDE_DIR=$PWD/../opencl-headers \
248255
-DCL_LIB_DIR=$PWD/../install/lib \
249-
-DCL_LIBCLCXX_DIR=. \
256+
-DSPIRV_INCLUDE_DIR=$PWD/../spirv-headers \
250257
-DCLConform_LIBRARIES=OpenCL
251258
working-directory: opencl-cts/build
252259
- name: Build CTS

.github/workflows/install-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ "`uname`" == "Linux" ]; then
2222
/usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 20
2323

2424
# Other dependencies
25-
sudo apt-get install -y libedit-dev libvulkan-dev
25+
sudo apt-get install -y libedit-dev libvulkan-dev spirv-tools
2626
elif [ "`uname`" == "Darwin" ]; then
2727
brew install llvm@${LLVM_VERSION}
2828
elif [[ "`uname`" == "MINGW64"* ]]; then

0 commit comments

Comments
 (0)