Commit c62898e4 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'ci-updates'

57e0bcd9 pythran: update to 0.11.0
3b674377 python3: update to 3.9.13
82520146 gitlab-ci: update to VS2022
db0753ef gitlab-ci: update to Xcode 13.3
002b2056 gitlab-ci: use the new CI image
5afdc687 ci: update to Fedora 36
a90090fe

 boost: support VS 2022
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !506
parents 6452787e 57e0bcd9
Pipeline #283339 passed with stage
......@@ -80,17 +80,17 @@ macos-x86_64-openssl:build:
## Normal build
windows-vs2019:build:
windows-vs2022:build:
extends:
- .windows_vs2019
- .windows_vs2022
- .cmake_build_windows
- .cmake_build_artifacts
- .windows_builder_tags
- .run_manually
windows-openssl-vs2019:build:
windows-openssl-vs2022:build:
extends:
- .windows_openssl_vs2019
- .windows_openssl_vs2022
- .cmake_build_windows
- .cmake_build_artifacts
- .windows_builder_tags
......
......@@ -28,12 +28,12 @@
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[windows_openssl_vs2019]"
"buildname": "[windows_openssl_vs2022]"
},
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[windows_vs2019]"
"buildname": "[windows_vs2022]"
}
]
}
FROM fedora:35
FROM fedora:36
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
COPY install_deps.sh /root/install_deps.sh
......
......@@ -14,7 +14,8 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015")
set(msvc_year "2015")
set(qt_abi "win64_msvc${msvc_year}_64")
elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR
"$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019")
"$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019" OR
"$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022")
set(qt_platform "windows_x86")
set(msvc_year "2019")
set(qt_abi "win64_msvc${msvc_year}_64")
......
......@@ -2,20 +2,20 @@
## Base images
.fedora35:
image: "kitware/paraview:ci-csb-fedora35-20220112"
.fedora36:
image: "kitware/paraview:ci-csb-fedora36-20220516"
variables:
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
.linux:
extends: .fedora35
extends: .fedora36
variables:
CMAKE_CONFIGURATION: linux
.linux_openssl:
extends: .fedora35
extends: .fedora36
variables:
CMAKE_CONFIGURATION: linux_openssl
......
......@@ -8,7 +8,7 @@
GIT_CLONE_PATH: "$CI_BUILDS_DIR/paraview-ci-ext/$CI_CONCURRENT_ID"
# TODO: Factor this out so that each job selects the Xcode version to
# use so that different versions can be tested in a single pipeline.
DEVELOPER_DIR: "/Applications/Xcode-13.1.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode-13.3.app/Contents/Developer"
# Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4234
......@@ -41,7 +41,7 @@
- paraview
- macos
- shell
- xcode-13.1
- xcode-13.3
- concurrent
.macos_arm64_builder_tags:
......@@ -49,7 +49,7 @@
- paraview
- macos-arm64
- shell
- xcode-13.1
- xcode-13.3
- concurrent
## macOS-specific scripts
......
......@@ -11,37 +11,37 @@
### Build and test
.windows_vs2019_addon:
.windows_vs2022_addon:
variables:
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.28.29910"
VCVARSVERSION: "14.32.31326"
.windows_vs2019:
.windows_vs2022:
extends:
- .windows_core
- .windows_vs2019_addon
- .windows_vs2022_addon
variables:
CMAKE_CONFIGURATION: windows_vs2019
CMAKE_CONFIGURATION: windows_vs2022
.windows_openssl_vs2019:
.windows_openssl_vs2022:
extends:
- .windows_core
- .windows_vs2019_addon
- .windows_vs2022_addon
variables:
CMAKE_CONFIGURATION: windows_openssl_vs2019
CMAKE_CONFIGURATION: windows_openssl_vs2022
## Tags
.windows_builder_tags:
tags:
- paraview # Since this is a bare runner, pin to a project.
- msvc-19.28-16.9
- msvc-19.32
- concurrent
- shell
- vs2019
- vs2022
- windows
## Windows-specific scripts
......
diff -u -Nru5 pythran-0.9.12.post1/setup.py pythran-0.9.12.post1.no-pytest/setup.py
--- pythran-0.9.12.post1/setup.py 2020-01-26 12:39:13.000000000 -0500
+++ pythran-0.9.12.post1.no-pytest/setup.py 2021-08-04 10:54:54.499623206 -0400
@@ -169,11 +169,11 @@
license="BSD 3-Clause",
install_requires=open('requirements.txt').read().splitlines(),
entry_points={'console_scripts':
['pythran = pythran.run:run',
'pythran-config = pythran.config:run']},
- setup_requires=["pytest-runner"],
+ #setup_requires=["pytest-runner"],
tests_require=['pytest', 'flake8'],
extras_require={
'doc': open('docs/requirements.txt').read().splitlines(),
},
test_suite="pythran.tests.test_cases",
......@@ -2,6 +2,3 @@ superbuild_add_project_python(pythonpythran
PACKAGE pythran
DEPENDS pythonsetuptools pythongast pythonbeniget pythonply
LICENSE_FILES LICENSE)
superbuild_apply_patch(pythonpythran no-pytest
"Remove pytest requirement")
......@@ -17,6 +17,8 @@ elseif (NOT MSVC_VERSION VERSION_GREATER 1919)
set(msvc_ver 14.1)
elseif (NOT MSVC_VERSION VERSION_GREATER 1930)
set(msvc_ver 14.2)
elseif (NOT MSVC_VERSION VERSION_GREATER 1932)
set(msvc_ver 14.2)
else ()
message(FATAL_ERROR "Unrecognized MSVC version: ${MSVC_VERSION}")
endif ()
......
......@@ -41,12 +41,12 @@ superbuild_set_revision(png
if (WIN32)
superbuild_set_revision(python3
URL "https://www.paraview.org/files/dependencies/python-3.9.5-windows-x86_64.zip"
URL_MD5 c41556099961c9e0d4d6afd419045bac)
URL "https://www.paraview.org/files/dependencies/python-3.9.13-windows-x86_64.zip"
URL_MD5 d55270fbc6356eb5c2b37bffd0c0b48b)
else()
superbuild_set_revision(python3
URL "https://www.paraview.org/files/dependencies/Python-3.9.5.tar.xz"
URL_MD5 71f7ada6bec9cdbf4538adc326120cfd)
URL "https://www.paraview.org/files/dependencies/Python-3.9.13.tar.xz"
URL_MD5 5e2411217b0060828d5f923eb422a3b8)
endif()
superbuild_set_revision(freetype
......@@ -154,8 +154,8 @@ superbuild_set_revision(pythonply
URL_MD5 6465f602e656455affcd7c5734c638f8)
superbuild_set_revision(pythonpythran
URL "https://www.paraview.org/files/dependencies/pythran-0.9.12.post1.tar.gz"
URL_MD5 b84d70ed33554dcef423673216bc3826)
URL "https://www.paraview.org/files/dependencies/pythran-0.11.0.tar.gz"
URL_MD5 e09e90484771937ab499380858bdb18d)
superbuild_set_revision(pythoncycler
URL "https://www.paraview.org/files/dependencies/cycler-0.10.0.tar.gz"
......
Supports Markdown
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