[Openvpn-devel] travis: bump MSVC to 2019

Message ID 1573317611-6462-1-git-send-email-lstipakov@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel] travis: bump MSVC to 2019
Related show

Commit Message

Lev Stipakov Nov. 9, 2019, 4:40 p.m.
From: Lev Stipakov <lev@openvpn.net>

Since we changed MSVC version in project files to 2019,
we have to do the same in travis script.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 .travis/build-check.sh | 2 +-
 .travis/build-deps.sh  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Simon Rozman Nov. 9, 2019, 5:25 p.m. | #1
Acked-by: Simon Rozman <simon@rozman.si>

Best regards,
Simon
Gert Doering Nov. 9, 2019, 5:37 p.m. | #2
Your patch has been applied to the master branch.

commit b8b3f1177e48678e3bbe955634fe412d5515fab0
Author: Lev Stipakov
Date:   Sat Nov 9 18:40:11 2019 +0200

     travis: bump MSVC to 2019

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Simon Rozman <simon@rozman.si>
     Message-Id: <1573317611-6462-1-git-send-email-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19074.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/.travis/build-check.sh b/.travis/build-check.sh
index d2d2e8a..039a7dc 100755
--- a/.travis/build-check.sh
+++ b/.travis/build-check.sh
@@ -2,7 +2,7 @@ 
 set -eux
 
 if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
-	PATH="/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/15.0/Bin/":$PATH
+	PATH="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Current/Bin/":$PATH
 	MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0
 fi
 
diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index 724ff30..4c5cb05 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -3,6 +3,8 @@  set -eux
 
 if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
     choco install strawberryperl nasm
+    choco install visualstudio2019buildtools --package-parameters "--includeRecommended --includeOptional"
+    choco install visualstudio2019-workload-vctools
     cd ..
     git clone https://github.com/openvpn/openvpn-build.git
     cd openvpn-build