Merge branch 'fix-issue-11-windows-saas-runners' into 'main' (4e017ae5) · Commits · tango-controls / TangoAccessControl

.gitlab-ci.yml

+2 −5

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ variables:
		MYSQL_VERSION: "5.7"
		MYSQL_VERSION_PATCH: "36"
		MSVC_VERSION: v141
		GENERATOR_VERSION: Visual Studio 16 2019
		GENERATOR_VERSION: Visual Studio 17 2022
		DEPS_PATH: C:/dependencies
		LIBTANGO: libtango_${TANGO_VERSION}_${MSVC_VERSION}_${ARCH}_static_release
		TANGO_PATH: ${DEPS_PATH}/${LIBTANGO}
		@@ -128,9 +128,6 @@ build-cppTango-main:
		MYSQL_PATH: "${DEPS_PATH}/${MYSQL}"
		before_script:
		- choco install cmake curl -y
		- $env:Path += ";C:\Program Files\CMake\bin"
		- $env:Path += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
		- msbuild /version
		- if (Test-Path "${DEPS_PATH}") { Remove-Item "${DEPS_PATH}" -Recurse -Force; }
		- New-Item "${DEPS_PATH}" -ItemType Directory
		# See LIBTANGO constant at the top for the exact name
		@@ -155,7 +152,7 @@ build-cppTango-main:
		- artifacts
		expire_in: 1 day
		tags:
		- shared-windows
		- saas-windows-medium-amd64

		build-win-64bit:
		extends: .build-template-win