diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-22 16:31:48 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-14 13:05:08 +0000 |
| commit | 711b89454bb8a6e25b34d38c31f55c477de65a95 (patch) | |
| tree | 2be00508faa9dadc721c9e42eebfc27791bb29f5 /.gitlab-ci | |
| parent | c743421f4ede72e00d65d0163322bb0ef678a9bc (diff) | |
ci: Install spirv-tools from Debian bullseye
v2:
* Drop local build from x86_test-gl image as well (Eric Anholt)
Reviewed-by: Eric Anholt <eric@anholt.net> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/build-spirv-tools.sh | 14 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_test-gl.sh | 7 |
3 files changed, 3 insertions, 20 deletions
diff --git a/.gitlab-ci/container/build-spirv-tools.sh b/.gitlab-ci/container/build-spirv-tools.sh deleted file mode 100644 index e39083c30d4..00000000000 --- a/.gitlab-ci/container/build-spirv-tools.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -ex - -git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Tools SPIRV-Tools -pushd SPIRV-Tools -pushd external -git clone --depth 1 https://github.com/KhronosGroup/SPIRV-Headers -popd -cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -ninja -C _build -ninja -C _build install -popd -rm -rf SPIRV-Tools diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 9fc58447934..2b9a6d1460d 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -42,6 +42,7 @@ apt-get install -y --no-remove \ llvm-9-dev \ ocl-icd-opencl-dev \ procps \ + spirv-tools \ strace \ time \ wine \ @@ -91,7 +92,6 @@ tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd rm -rf libglvnd-v$GLVND_VERSION -. .gitlab-ci/container/build-spirv-tools.sh git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --single-branch --shallow-since=2020-11-12 pushd SPIRV-LLVM-Translator diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index f92b3099c02..68907f2c359 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -46,7 +46,8 @@ apt-get install -y --no-remove \ ocl-icd-libopencl1 \ python3-lxml \ python3-renderdoc \ - python3-simplejson + python3-simplejson \ + spirv-tools . .gitlab-ci/container/container_pre_build.sh @@ -56,10 +57,6 @@ apt-get install -y --no-remove \ . .gitlab-ci/container/build-libdrm.sh -############### Build spirv-tools (debian too old) - -. .gitlab-ci/container/build-spirv-tools.sh - ############### Build libclc . .gitlab-ci/container/build-libclc.sh |