diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-07-26 15:06:01 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-07-26 15:35:41 +0100 |
| commit | f7bb4ff80bfa5e5173232685b13f143b572f36de (patch) | |
| tree | f5898b01c3a9a4981a00e0a631b9a3cbbfbfdf67 | |
| parent | 6fb63c9285b79bc2c6b67845273abdc7eaacaa1c (diff) | |
| download | libgit2-f7bb4ff80bfa5e5173232685b13f143b572f36de.tar.gz | |
ci: use a single setup script for mingw
| -rw-r--r-- | .vsts-ci.yml | 6 | ||||
| -rw-r--r-- | ci/setup-mingw-x86.ps1 | 20 | ||||
| -rw-r--r-- | ci/setup-mingw.ps1 (renamed from ci/setup-mingw-amd64.ps1) | 13 |
3 files changed, 13 insertions, 26 deletions
diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 07c38eee0..2731e0a2e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -176,10 +176,11 @@ phases: queue: name: Hosted steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw-amd64.ps1' + - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' displayName: Setup env: TEMP: $(Agent.TempDirectory) + ARCH: amd64 - powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' displayName: Build env: @@ -193,10 +194,11 @@ phases: queue: name: Hosted steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw-x86.ps1' + - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' displayName: Setup env: TEMP: $(Agent.TempDirectory) + ARCH: x86 - powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' displayName: Build env: diff --git a/ci/setup-mingw-x86.ps1 b/ci/setup-mingw-x86.ps1 deleted file mode 100644 index 832c0f537..000000000 --- a/ci/setup-mingw-x86.ps1 +++ /dev/null @@ -1,20 +0,0 @@ -Set-StrictMode -Version Latest - -$ErrorActionPreference = "Stop" -$PSDefaultParameterValues['*:ErrorAction'] = 'Stop' - -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - -[Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem"); - -Write-Host "##############################################################################" -Write-Host "## Downloading mingw" -Write-Host "##############################################################################" - -$mingw_uri = "https://bintray.com/libgit2/build-dependencies/download_file?file_path=mingw-w64-i686-8.1.0-release-win32-sjlj-rt_v6-rev0.zip" -$platform = "x86" - -$wc = New-Object net.webclient -$wc.Downloadfile($mingw_uri, "${Env:TEMP}/mingw-${platform}.zip") - -[System.IO.Compression.ZipFile]::ExtractToDirectory("${Env:TEMP}/mingw-${platform}.zip", $Env:TEMP) diff --git a/ci/setup-mingw-amd64.ps1 b/ci/setup-mingw.ps1 index eaa670968..76ecd3987 100644 --- a/ci/setup-mingw-amd64.ps1 +++ b/ci/setup-mingw.ps1 @@ -11,10 +11,15 @@ Write-Host "#################################################################### Write-Host "## Downloading mingw" Write-Host "##############################################################################" -$mingw_uri = "https://bintray.com/libgit2/build-dependencies/download_file?file_path=mingw-w64-x86_64-8.1.0-release-win32-seh-rt_v6-rev0.zip" -$platform = "x86_64" +if ($env:ARCH -eq "amd64") { + $mingw_uri = "https://bintray.com/libgit2/build-dependencies/download_file?file_path=mingw-w64-x86_64-8.1.0-release-win32-seh-rt_v6-rev0.zip" + $platform = "x86_64" +} else { + $mingw_uri = "https://bintray.com/libgit2/build-dependencies/download_file?file_path=mingw-w64-i686-8.1.0-release-win32-sjlj-rt_v6-rev0.zip" + $platform = "x86" +} $wc = New-Object net.webclient -$wc.Downloadfile($mingw_uri, "${Env:TEMP}/mingw-${platform}.zip") +$wc.Downloadfile($mingw_uri, "${Env:TEMP}/mingw-${Env:ARCH}.zip") -[System.IO.Compression.ZipFile]::ExtractToDirectory("${Env:TEMP}/mingw-${platform}.zip", $Env:TEMP) +[System.IO.Compression.ZipFile]::ExtractToDirectory("${Env:TEMP}/mingw-${Env:ARCH}.zip", $Env:TEMP) |