Skip to content

Commit

Permalink
Merge branch 'michxymi/IONDEV-2089_build_wheel_vs2019' into 'master'
Browse files Browse the repository at this point in the history
added msvc 2019 build job

Closes IONDEV-2089

See merge request minknow/pod5-file-format!344
  • Loading branch information
Michael Xymitoulias committed Apr 26, 2024
2 parents 2116710 + eab75d0 commit ef29510
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 28 deletions.
23 changes: 6 additions & 17 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,19 +396,19 @@ osx-arm64-clang14-release-build:
- pip install build
- !reference [".conan-build-and-test"]

win-x64-msvc2017-release-build:
win-x64-msvc2019-release-build:
extends: [".build-win-common"]
tags:
- windows
- cmake
- VS2017
- VS2019
- conan
variables:
CONAN_PROFILE: "windows-x86_64-vs2017.jinja"
CONAN_PROFILE: "windows-x86_64-vs2019.jinja"
CONAN_PROFILE_CPPSTD: 17
OUTPUT_SKU: "win-x64"
CMAKE_ARGS: "-A x64"
CMAKE_GENERATOR: "Visual Studio 15 2017"
CMAKE_GENERATOR: "Visual Studio 16 2019"
parallel:
matrix:
- PYTHON_VERSION: ["38", "39", "310", "311", "312"]
Expand All @@ -418,7 +418,6 @@ win-x64-msvc2017-release-build:
- "lib_pod5*.tar.gz"
- "lib_pod5*.whl"


# ======================================
#
# Build Python API
Expand Down Expand Up @@ -579,7 +578,7 @@ pytest-win-x64:
tags:
- windows
needs:
- win-x64-msvc2017-release-build
- win-x64-msvc2019-release-build
- build-python-api
before_script:
- c:/Python3${PY_MINOR_VER}/python -m venv .venv
Expand Down Expand Up @@ -739,16 +738,6 @@ benchmark-linux-aarch64:
- rm -rf "${CONAN_USER_HOME}/.conan"

# Conan: build and upload packages:
build-conan:windows-x86_64-vs2017:
extends:
- .profile-windows-x86_64-vs2017
- .build-package-win
- .conan-build-common
- .build-shared-and-static
upload-conan:windows-x86_64-vs2017:
extends: .conan-upload
dependencies: [ "prepare_version", "build-conan:windows-x86_64-vs2017" ]

build-conan:windows-x86_64-vs2019:
extends:
- .profile-windows-x86_64-vs2019
Expand Down Expand Up @@ -860,7 +849,7 @@ build-archive:
- linux-aarch64-gcc9-release-build
- osx-x64-clang14-release-build
- osx-arm64-clang14-release-build
- win-x64-msvc2017-release-build
- win-x64-msvc2019-release-build
- build-python-api
script:
- find .
Expand Down
11 changes: 0 additions & 11 deletions ci/gitlab-ci-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,6 @@ before_script:
PROFILE_BASE: windows-x86_64-vs2019.jinja
parallel: !reference [.parallel-cppstd,parallel]

.profile-windows-x86_64-vs2017:
# Set up for Windows x86 using VS 2017, using conan and the profile windows-x86_64-vs2017,
# adapted for debug and release. To be called from individual packages by using "extends".
tags:
- windows
- VS2017
- conan
variables:
PROFILE_BASE: windows-x86_64-vs2017.jinja
parallel: !reference [.parallel-cppstd,parallel]

#
# Set up for MacOS versions
#
Expand Down

0 comments on commit ef29510

Please sign in to comment.