diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-08-18 15:23:23 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2020-08-28 15:21:31 (GMT) |
| commit | 5ece12b7e452acb091300022a392ff71dfce9504 (patch) | |
| tree | 58df9c91b2b97e12d2df057936613790a578cb1b /.gitlab/ci | |
| parent | 8976817d6d4cf8ba5755ab24e2760c4c9cb485de (diff) | |
| download | CMake-5ece12b7e452acb091300022a392ff71dfce9504.zip CMake-5ece12b7e452acb091300022a392ff71dfce9504.tar.gz CMake-5ece12b7e452acb091300022a392ff71dfce9504.tar.bz2 | |
gitlab-ci: add ISPC to the Fedora CI image
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_fedora31_common.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_makefiles.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_ninja_multi.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/docker/fedora31/Dockerfile | 3 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora31/install_ispc.sh | 14 |
6 files changed, 21 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_fedora31_common.cmake b/.gitlab/ci/configure_fedora31_common.cmake index dc068d5..90b9d90 100644 --- a/.gitlab/ci/configure_fedora31_common.cmake +++ b/.gitlab/ci/configure_fedora31_common.cmake @@ -1,4 +1,5 @@ set(BUILD_CursesDialog ON CACHE BOOL "") set(BUILD_QtDialog ON CACHE BOOL "") + include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora31_makefiles.cmake index 20863a2..efb4b84 100644 --- a/.gitlab/ci/configure_fedora31_makefiles.cmake +++ b/.gitlab/ci/configure_fedora31_makefiles.cmake @@ -1 +1,2 @@ +set(CMake_TEST_ISPC "ON" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora31_ninja.cmake b/.gitlab/ci/configure_fedora31_ninja.cmake index 74768b7..dad6d45 100644 --- a/.gitlab/ci/configure_fedora31_ninja.cmake +++ b/.gitlab/ci/configure_fedora31_ninja.cmake @@ -1 +1,2 @@ +set(CMake_TEST_ISPC "ON" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake") diff --git a/.gitlab/ci/configure_fedora31_ninja_multi.cmake b/.gitlab/ci/configure_fedora31_ninja_multi.cmake index 20863a2..efb4b84 100644 --- a/.gitlab/ci/configure_fedora31_ninja_multi.cmake +++ b/.gitlab/ci/configure_fedora31_ninja_multi.cmake @@ -1 +1,2 @@ +set(CMake_TEST_ISPC "ON" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/docker/fedora31/Dockerfile b/.gitlab/ci/docker/fedora31/Dockerfile index 5588a85..4ad8d45 100644 --- a/.gitlab/ci/docker/fedora31/Dockerfile +++ b/.gitlab/ci/docker/fedora31/Dockerfile @@ -3,3 +3,6 @@ MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_deps.sh /root/install_deps.sh RUN sh /root/install_deps.sh + +COPY install_ispc.sh /root/install_ispc.sh +RUN sh /root/install_ispc.sh diff --git a/.gitlab/ci/docker/fedora31/install_ispc.sh b/.gitlab/ci/docker/fedora31/install_ispc.sh new file mode 100755 index 0000000..fdc14b5 --- /dev/null +++ b/.gitlab/ci/docker/fedora31/install_ispc.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +readonly version="1.13.0" +readonly sha256sum="8ab1189bd5db596b3eee9d9465d3528b6626a7250675d67102761bb0d284cd21" + +readonly filename="ispc-v$version-linux" +readonly tarball="$filename.tar.gz" + +echo "$sha256sum $tarball" > ispc.sha256sum +curl -OL "https://github.com/ispc/ispc/releases/download/v$version/$tarball" +sha256sum --check ispc.sha256sum +tar --strip-components=1 -C /usr/local -xf "$tarball" "$filename/bin/ispc" |