Unverified Commit 97e80645 authored by Michael Bonani's avatar Michael Bonani Committed by GitHub
Browse files

[CI] MSVC version 16.15 as toolset (#820)

* MSVC version 14.25 as toolset
* fix vpl3 sha key
* fix msvc installation
parent 1b9a0036
......@@ -26,6 +26,8 @@ variables:
value: "https://github.com/Mobsya/ci-data/releases/download/data/vpl3-thymio-suite.tar.gz"
- name: vcpkg_commit
value: "c4f0372c638831d8d524feb1039611852eca6512"
- name: visual_bootstrapper
value: "https://github.com/Mobsya/ci-data/releases/download/data/vs_enterprise.exe"
jobs:
- job: 'BuildFlatpak'
......@@ -57,7 +59,7 @@ jobs:
QT_URL: "https://github.com/Mobsya/ci-data/releases/download/data/qt-5.12-msvc-x64.7z"
CMAKE_PREFIX_PATH: $(Build.BinariesDirectory)/Qt/5.12.3/msvc2017_64/
cmake_generator: "Visual Studio 16 2019"
ARCH_CMAKE: "-A x64"
ARCH_CMAKE: "-A x64 -T version=14.25"
VCINSTALLDIR: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC"
x86:
ARCH: 'x86'
......@@ -65,7 +67,7 @@ jobs:
QT_URL: "https://github.com/Mobsya/ci-data/releases/download/data/qt-5.12-msvc-x86.7z"
CMAKE_PREFIX_PATH: $(Build.BinariesDirectory)/Qt/5.12.3/msvc2017
cmake_generator: "Visual Studio 16 2019"
ARCH_CMAKE: "-A Win32"
ARCH_CMAKE: "-A Win32 -T version=14.25"
VCINSTALLDIR: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC"
steps:
- script: |
......@@ -74,6 +76,12 @@ jobs:
- script: |
makensis -VERSION
displayName: Install NSIS
- powershell: |
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$client = new-object System.Net.WebClient
$client.DownloadFile("$(visual_bootstrapper)","vs_enterprise.exe")
.\vs_enterprise.exe modify --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" --add Microsoft.VisualStudio.Component.VC.14.25.x86.x64 --passive --wait
displayName: Install MSVC 14.25
- task: Cache@2
displayName: Cache vcpkg
inputs:
......
......@@ -94,7 +94,7 @@
{
"type": "archive",
"url": "https://github.com/Mobsya/ci-data/releases/download/data/vpl3-thymio-suite.tar.gz",
"sha256": "b3b80badfdbd875247b9379e691cfe43a56b70b80116e475dc86eb0ca704ac70",
"sha256": "bdf71cc2dbc675faeb588bb842fa9335d0873b96e8ba2920ce06d326ce0731f7",
"strip-components": 0
}
],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment