Skip to content

Commit

Permalink
ci,azure-pipelines: re-purpose VS2017 builds as VS2019_Win32
Browse files Browse the repository at this point in the history
Microsoft has a pretty good track record for making their Visual Studio
compilers work fine across multiple Windows versions.
And libiio isn't a super-complicated project, in terms of scale and what
Visual Studio can handle.

So, instead of building on 2 versions of Visual Studio, might as well build
for a single one, but for different architectures.
Building for Win32 & Win64 is more important.

This change re-purposes the VS2017 build to VS2019_Win32 (i.e. Visual
Studio 2019 and Win32).

Signed-off-by: Alexandru Ardelean <[email protected]>
  • Loading branch information
commodo committed Dec 22, 2020
1 parent 74aeca0 commit 274d04f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion CI/install_deps_win.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

$ARCH=$Env:ARCH

git submodule update --init

if (!(Test-Path deps)) {
Expand All @@ -7,7 +9,12 @@ if (!(Test-Path deps)) {
cd deps

mkdir libxml
wget https://www.zlatkovic.com/pub/libxml/64bit/libxml2-2.9.3-win32-x86_64.7z -OutFile "libxml.7z"

if ( "$ARCH" -eq "x64" ) {
wget https://www.zlatkovic.com/pub/libxml/64bit/libxml2-2.9.3-win32-x86_64.7z -OutFile "libxml.7z"
} else {
wget https://www.zlatkovic.com/pub/libxml/64bit/libxml2-2.9.3-win32-x86.7z -OutFile "libxml.7z"
}
7z x -y libxml.7z
rm libxml.7z

Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ jobs:
- job: WindowsBuilds
strategy:
matrix:
VS2017:
imageName: 'vs2017-win2016'
COMPILER: 'Visual Studio 15 2017'
ARCH: 'x64'
artifactName: 'Windows-VS-15-2017-x64'
VS2019:
VS2019_Win32:
imageName: 'windows-2019'
COMPILER: 'Visual Studio 16 2019'
ARCH: 'Win32'
artifactName: 'Windows-VS-16-2019-Win32'
VS2019_Win64:
imageName: 'windows-2019'
COMPILER: 'Visual Studio 16 2019'
ARCH: 'x64'
Expand Down

0 comments on commit 274d04f

Please sign in to comment.