Commit 0bfd8ec3 authored by Aron Helser's avatar Aron Helser Committed by Kitware Robot
Browse files

Merge topic 'update_ci_images'

fe5117de

 Update ci images, avoid avx512 on linux.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !769
parents 0097c347 fe5117de
Pipeline #204236 failed with stages
...@@ -2,6 +2,12 @@ set(CTEST_USE_LAUNCHERS "ON" CACHE STRING "") ...@@ -2,6 +2,12 @@ set(CTEST_USE_LAUNCHERS "ON" CACHE STRING "")
set(cmb_enable_testing "ON" CACHE BOOL "") set(cmb_enable_testing "ON" CACHE BOOL "")
# Build binaries that will run on older architectures
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "fedora")
set(CMAKE_C_FLAGS "-march=core2 -mno-avx512f" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-march=core2 -mno-avx512f" CACHE STRING "")
endif ()
include("${CMAKE_CURRENT_LIST_DIR}/configure_sccache.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_sccache.cmake")
# Include the superbuild settings. # Include the superbuild settings.
......
...@@ -9,13 +9,13 @@ set(data_host "https://data.kitware.com") ...@@ -9,13 +9,13 @@ set(data_host "https://data.kitware.com")
# Determine the tarball to download. # Determine the tarball to download.
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019") if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019")
# 20201001 # 20201202
set(file_item "5f75d22350a41e3d19beed33") set(file_item "5fc7b92850a41e3d197ee93a")
set(file_hash "a555ef360539ba7c8fd838b9c94e670a26b292bcad16417423ae5cfe54ac8efaf9be2995ef3775ebdc6007c56568a5c539d6c5acaf2d6ff50d8d496b6af7ee81") set(file_hash "a4b56bdf3d445ff3fcc170b90efebd2ea67c5a19d8493ea74def2942a179576baf5a840d6407ee8de69fb3f275841926d4293db9c342c0b3c559a9104ca2fc55")
elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos")
# 20200912 # 20201202
set(file_item "5f74716e50a41e3d19bb5ef4") set(file_item "5fc7ba5050a41e3d197ee9cd")
set(file_hash "26832c678d2c41f247005c0d56736933cbf12a3fed8db9449def49dbce598c8f332f070c2932ceeefeface273e32a4b323a578408fe13c9a64361a14e96d0101") set(file_hash "81305cd62371ed782e20f43791eca3ce442f261b03506e0eb3602b494341daa781c4186ec89c04659cbb5f0223aab7306dcc9005dd3981fea12cd49f2e13278f")
else () else ()
message(FATAL_ERROR message(FATAL_ERROR
"Unknown build to use for the superbuild") "Unknown build to use for the superbuild")
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
### Fedora ### Fedora
.fedora31: .fedora31:
image: "kitware/cmb:ci-cmb-fedora31-20200910" image: "kitware/cmb:ci-cmb-fedora31-20201201"
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment