From eab75d036a5c583cd66e99c1ef8dfc47724980d2 Mon Sep 17 00:00:00 2001
From: Michael Xymitoulias <michael.xymitoulias@nanoporetech.com>
Date: Fri, 26 Apr 2024 08:41:42 +0000
Subject: [PATCH] added msvc 2019 build job

---
 .gitlab-ci.yml          | 23 ++++++-----------------
 ci/gitlab-ci-common.yml | 11 -----------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b050220..798072d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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"]
@@ -418,7 +418,6 @@ win-x64-msvc2017-release-build:
       - "lib_pod5*.tar.gz"
       - "lib_pod5*.whl"
 
-
 # ======================================
 #
 #     Build Python API
@@ -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
@@ -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
@@ -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 .
diff --git a/ci/gitlab-ci-common.yml b/ci/gitlab-ci-common.yml
index 26eeca1..cea45ed 100644
--- a/ci/gitlab-ci-common.yml
+++ b/ci/gitlab-ci-common.yml
@@ -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
 #