From a22791c9e0c65a76b6ddce728bd944aa8328511b Mon Sep 17 00:00:00 2001 From: Kyle Schwarz Date: Mon, 3 Feb 2025 17:16:30 -0500 Subject: [PATCH] CI: Move Windows jobs --- .gitlab-ci.yml | 8 ++++---- ci/build-windows32.bat | 2 +- ci/build-windows64.bat | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8a3b13..b03ebe2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ build windows/x64: - build expire_in: 3 days tags: - - icsneo-windows + - libicsneo-win-x64 unit_test windows/x64: stage: unit_test @@ -32,7 +32,7 @@ unit_test windows/x64: needs: - build windows/x64 tags: - - icsneo-windows + - libicsneo-win-x64 timeout: 5m build windows/x86: @@ -45,7 +45,7 @@ build windows/x86: - build expire_in: 3 days tags: - - icsneo-windows + - libicsneo-win-x64 unit_test windows/x86: stage: unit_test @@ -56,7 +56,7 @@ unit_test windows/x86: needs: - build windows/x86 tags: - - icsneo-windows + - libicsneo-win-x64 timeout: 5m #------------------------------------------------------------------------------- diff --git a/ci/build-windows32.bat b/ci/build-windows32.bat index 6ef26b4..5251378 100644 --- a/ci/build-windows32.bat +++ b/ci/build-windows32.bat @@ -1,2 +1,2 @@ -call "%VCVARS32%" +call "%VCVARS32_2022%" call "ci\build-windows.bat" diff --git a/ci/build-windows64.bat b/ci/build-windows64.bat index f25aec4..8d5fc22 100644 --- a/ci/build-windows64.bat +++ b/ci/build-windows64.bat @@ -1,2 +1,2 @@ -call "%VCVARS64%" +call "%VCVARS64_2022%" call "ci\build-windows.bat"