From 8a68ab8ad0fd3e88d75dacaeb365dbc56d3ce75b Mon Sep 17 00:00:00 2001 From: zvon Date: Wed, 15 Apr 2020 13:26:18 +0200 Subject: [PATCH] CI: turns out windows runners already have visual studio installed --- .gitlab-ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bcfee5..5074153 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,15 +54,10 @@ windows:build: - "$env:LC_ALL='C.UTF-8'" - "$OutputEncoding = [System.Text.Encoding]::Unicode" - CHCP 65001 - - mkdir C:\BuildTools - - mkdir C:\TMP - - curl -UseBasicParsing https://aka.ms/vs/16/release/vs_buildtools.exe -o C:\TMP\vs_buildtools.exe - - $returnCode = Start-Process -FilePath C:\TMP\vs_buildtools.exe -ArgumentList "--quiet", "--wait", "--norestart", "--nocache", "--installPath", "C:\BuildTools", "--add", "Microsoft.VisualStudio.Workload.VCTools", "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "--includeRecommended" -Wait -PassThru - - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) - choco install make script: - - cmd /c 'C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat && set CXX=cl.exe && make windows' - - cmd /c 'C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat && set CXX=cl.exe && make windows_gui' + - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && set CXX=cl.exe && make windows' + - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && set CXX=cl.exe && make windows_gui' artifacts: paths: - tv_rename.exe