Browse Source

ci: remove ISPC from the Fedora CI image

Revert commit 5ece12b7e4 (gitlab-ci: add ISPC to the Fedora CI image,
2020-08-18, v3.19.0-rc1~244^2).  Later we will download ISPC in specific
jobs.

Update a `RunCMake.NinjaMultiConfig` test expectation to account for
a change to the Qt deployed on Fedora 36.
Brad King 3 years ago
parent
commit
49996faaac

+ 0 - 1
.gitlab/ci/configure_fedora36_makefiles.cmake

@@ -73,7 +73,6 @@ set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "")
 set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "")
 set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "")
 set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "")
-set(CMake_TEST_ISPC "ON" CACHE STRING "")
 set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
 set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
 

+ 0 - 1
.gitlab/ci/configure_fedora36_ninja.cmake

@@ -1,4 +1,3 @@
-set(CMake_TEST_ISPC "ON" CACHE STRING "")
 set(CMake_TEST_GUI "ON" CACHE BOOL "")
 
 # "Release" flags without "-DNDEBUG" so we get assertions.

+ 0 - 1
.gitlab/ci/configure_fedora36_ninja_multi.cmake

@@ -1,2 +1 @@
-set(CMake_TEST_ISPC "ON" CACHE STRING "")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

+ 0 - 3
.gitlab/ci/docker/fedora36/Dockerfile

@@ -10,9 +10,6 @@ MAINTAINER Ben Boeckel <[email protected]>
 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
-
 COPY --from=rvm-build /root/rvm.tar /root/rvm.tar
 RUN tar -C /usr/local -xf /root/rvm.tar \
  && rm /root/rvm.tar

+ 0 - 14
.gitlab/ci/docker/fedora36/install_ispc.sh

@@ -1,14 +0,0 @@
-#!/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"

+ 1 - 1
.gitlab/os-linux.yml

@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora36:
-    image: "kitware/cmake:ci-fedora36-x86_64-2022-05-17"
+    image: "kitware/cmake:ci-fedora36-x86_64-2022-06-06"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"

+ 1 - 1
Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake

@@ -17,7 +17,7 @@ function(check_files dir)
   list(SORT expected)
 
   file(GLOB_RECURSE actual "${dir}/*")
-  list(FILTER actual EXCLUDE REGEX "/CMakeFiles/|\\.ninja$|/CMakeCache\\.txt$|/target_files[^/]*\\.cmake$|/\\.ninja_[^/]*$|/cmake_install\\.cmake$|\\.ilk$|\\.manifest$|\\.pdb$|\\.exp$|/install_manifest\\.txt$")
+  list(FILTER actual EXCLUDE REGEX "/CMakeFiles/|\\.ninja$|/CMakeCache\\.txt$|/target_files[^/]*\\.cmake$|/\\.ninja_[^/]*$|/cmake_install\\.cmake$|\\.ilk$|\\.manifest$|\\.pdb$|\\.exp$|/install_manifest\\.txt$|/\\.qt/QtDeploySupport[^/]*\\.cmake$")
   foreach(f IN LISTS _check_files_INCLUDE _check_files_EXCLUDE)
     if(EXISTS ${f})
       list(APPEND actual ${f})