diff options
-rw-r--r-- | .gitlab/ci/configure_fedora36_makefiles.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora36_ninja.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/configure_fedora36_ninja_multi.cmake | 4 | ||||
-rw-r--r-- | .gitlab/ci/configure_macos_x86_64_makefiles.cmake | 4 | ||||
-rw-r--r-- | .gitlab/ci/configure_macos_x86_64_ninja.cmake | 4 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake | 4 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora36_makefiles.sh | 3 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora36_ninja.sh | 3 | ||||
-rw-r--r-- | .gitlab/ci/env_fedora36_ninja_multi.sh | 3 | ||||
-rw-r--r-- | .gitlab/ci/env_macos_x86_64_makefiles.sh | 3 | ||||
-rw-r--r-- | .gitlab/ci/env_macos_x86_64_ninja.sh | 3 | ||||
-rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64_ninja.ps1 | 3 | ||||
-rwxr-xr-x | .gitlab/ci/ispc-env.ps1 | 4 | ||||
-rw-r--r-- | .gitlab/ci/ispc-env.sh | 3 | ||||
-rwxr-xr-x | .gitlab/ci/ispc.ps1 | 19 | ||||
-rwxr-xr-x | .gitlab/ci/ispc.sh | 36 |
16 files changed, 102 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_fedora36_makefiles.cmake b/.gitlab/ci/configure_fedora36_makefiles.cmake index 25df029..c5b5190 100644 --- a/.gitlab/ci/configure_fedora36_makefiles.cmake +++ b/.gitlab/ci/configure_fedora36_makefiles.cmake @@ -73,6 +73,9 @@ 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 "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() set(CMake_TEST_Qt5 "ON" CACHE BOOL "") set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora36_ninja.cmake b/.gitlab/ci/configure_fedora36_ninja.cmake index 7d5105d..45d9192 100644 --- a/.gitlab/ci/configure_fedora36_ninja.cmake +++ b/.gitlab/ci/configure_fedora36_ninja.cmake @@ -1,4 +1,7 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() # "Release" flags without "-DNDEBUG" so we get assertions. set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") diff --git a/.gitlab/ci/configure_fedora36_ninja_multi.cmake b/.gitlab/ci/configure_fedora36_ninja_multi.cmake index 20863a2..94af721 100644 --- a/.gitlab/ci/configure_fedora36_ninja_multi.cmake +++ b/.gitlab/ci/configure_fedora36_ninja_multi.cmake @@ -1 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_makefiles.cmake b/.gitlab/ci/configure_macos_x86_64_makefiles.cmake index f657d98..d3ef93f 100644 --- a/.gitlab/ci/configure_macos_x86_64_makefiles.cmake +++ b/.gitlab/ci/configure_macos_x86_64_makefiles.cmake @@ -1,3 +1,7 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_ninja.cmake b/.gitlab/ci/configure_macos_x86_64_ninja.cmake index f657d98..d3ef93f 100644 --- a/.gitlab/ci/configure_macos_x86_64_ninja.cmake +++ b/.gitlab/ci/configure_macos_x86_64_ninja.cmake @@ -1,3 +1,7 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "") +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake index c078f90..7f57181 100644 --- a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake @@ -1 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake") diff --git a/.gitlab/ci/env_fedora36_makefiles.sh b/.gitlab/ci/env_fedora36_makefiles.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora36_makefiles.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_fedora36_ninja.sh b/.gitlab/ci/env_fedora36_ninja.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora36_ninja.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_fedora36_ninja_multi.sh b/.gitlab/ci/env_fedora36_ninja_multi.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_fedora36_ninja_multi.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_macos_x86_64_makefiles.sh b/.gitlab/ci/env_macos_x86_64_makefiles.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_makefiles.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_macos_x86_64_ninja.sh b/.gitlab/ci/env_macos_x86_64_ninja.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_ninja.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 new file mode 100755 index 0000000..f8a86c4 --- /dev/null +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 @@ -0,0 +1,3 @@ +if ("$env:CMAKE_CI_NIGHTLY" -eq "true") { + Invoke-Expression ".gitlab/ci/ispc-env.ps1" +} diff --git a/.gitlab/ci/ispc-env.ps1 b/.gitlab/ci/ispc-env.ps1 new file mode 100755 index 0000000..1baea31 --- /dev/null +++ b/.gitlab/ci/ispc-env.ps1 @@ -0,0 +1,4 @@ +$pwdpath = $pwd.Path +powershell -File ".gitlab/ci/ispc.ps1" +Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\ispc\bin;$env:PATH" +ispc --version diff --git a/.gitlab/ci/ispc-env.sh b/.gitlab/ci/ispc-env.sh new file mode 100644 index 0000000..31a4494 --- /dev/null +++ b/.gitlab/ci/ispc-env.sh @@ -0,0 +1,3 @@ +.gitlab/ci/ispc.sh +export PATH=$PWD/.gitlab/ispc/bin:$PATH +ispc --version diff --git a/.gitlab/ci/ispc.ps1 b/.gitlab/ci/ispc.ps1 new file mode 100755 index 0000000..13267c3 --- /dev/null +++ b/.gitlab/ci/ispc.ps1 @@ -0,0 +1,19 @@ +$erroractionpreference = "stop" + +$version = "1.18.0" +$sha256sum = "9210BB2D9D3711367FACCB37ACF49966696132560B565471C1C6121F4924A17E" +$filename = "ispc-v$version-windows" +$tarball = "$filename.zip" + +$outdir = $pwd.Path +$outdir = "$outdir\.gitlab" +$ProgressPreference = 'SilentlyContinue' +Invoke-WebRequest -Uri "https://github.com/ispc/ispc/releases/download/v$version/$tarball" -OutFile "$outdir\$tarball" +$hash = Get-FileHash "$outdir\$tarball" -Algorithm SHA256 +if ($hash.Hash -ne $sha256sum) { + exit 1 +} + +Add-Type -AssemblyName System.IO.Compression.FileSystem +[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") +Move-Item -Path "$outdir\$filename" -Destination "$outdir\ispc" diff --git a/.gitlab/ci/ispc.sh b/.gitlab/ci/ispc.sh new file mode 100755 index 0000000..2804277 --- /dev/null +++ b/.gitlab/ci/ispc.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +readonly version="1.18.0" + +case "$(uname -s)-$(uname -m)" in + Linux-x86_64) + shatool="sha256sum" + sha256sum="6c379bb97962e9de7d24fd48b3f7e647dc42be898e9d187948220268c646b692" + platform="linux" + ;; + Darwin-x86_64) + shatool="shasum -a 256" + sha256sum="d1435b541182406ff6b18446d31ecceef0eae3aed7654391ae676d3142e0000d" + platform="macOS" + ;; + *) + echo "Unrecognized platform $(uname -s)-$(uname -m)" + exit 1 + ;; +esac +readonly shatool +readonly sha256sum +readonly platform + +readonly filename="ispc-v$version-$platform" +readonly tarball="$filename.tar.gz" + +cd .gitlab + +echo "$sha256sum $tarball" > ispc.sha256sum +curl -OL "https://github.com/ispc/ispc/releases/download/v$version/$tarball" +$shatool --check ispc.sha256sum +tar xf "$tarball" +mv "$filename" ispc |