azure: use bash scripts across all platforms Right now, we maintain semantically equivalent build scripts in both Bash and Powershell to support both Windows and non-Windows hosts. Azure Pipelines supports Bash on Windows, too, via Git for Windows, and as such it's not really required to maintain the Powershell scripts at all. Remove them to reduce our own maintenance burden.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index abe0c3e..2d79dd3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted
steps:
- - template: azure-pipelines/powershell.yml
+ - template: azure-pipelines/bash.yml
parameters:
environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 Win64
@@ -88,7 +88,7 @@ jobs:
displayName: 'Windows (x86; Visual Studio)'
pool: Hosted
steps:
- - template: azure-pipelines/powershell.yml
+ - template: azure-pipelines/bash.yml
parameters:
environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013
@@ -103,7 +103,7 @@ jobs:
env:
TEMP: $(Agent.TempDirectory)
ARCH: amd64
- - template: azure-pipelines/powershell.yml
+ - template: azure-pipelines/bash.yml
parameters:
environmentVariables:
BUILD_PATH: $(Agent.TempDirectory)\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
@@ -120,7 +120,7 @@ jobs:
env:
TEMP: $(Agent.TempDirectory)
ARCH: x86
- - template: azure-pipelines/powershell.yml
+ - template: azure-pipelines/bash.yml
parameters:
environmentVariables:
BUILD_PATH: $(Agent.TempDirectory)\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
diff --git a/azure-pipelines/build.ps1 b/azure-pipelines/build.ps1
deleted file mode 100644
index 96f39db..0000000
--- a/azure-pipelines/build.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-Set-StrictMode -Version Latest
-
-$ErrorActionPreference = "Stop"
-$PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
-
-if ($Env:SOURCE_DIR) { $SourceDirectory = $Env:SOURCE_DIR } else { $SourceDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path -Parent) -Parent }
-$BuildDirectory = $(Get-Location).Path
-
-Write-Host "Source directory: ${SourceDirectory}"
-Write-Host "Build directory: ${BuildDirectory}"
-Write-Host ""
-Write-Host "Operating system version:"
-Get-CimInstance Win32_OperatingSystem | Select-Object Caption, Version, ServicePackMajorVersion, BuildNumber, OSArchitecture | Format-List
-Write-Host "PATH: ${Env:PATH}"
-Write-Host ""
-
-Write-Host "##############################################################################"
-Write-Host "## Configuring build environment"
-Write-Host "##############################################################################"
-
-Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DENABLE_WERROR=ON -G '${Env:CMAKE_GENERATOR}' ${Env:CMAKE_OPTIONS}"
-if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
-
-Write-Host ""
-Write-Host "##############################################################################"
-Write-Host "## Building libgit2"
-Write-Host "##############################################################################"
-
-cmake --build .
-if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
diff --git a/azure-pipelines/nightly.yml b/azure-pipelines/nightly.yml
index b6d5ed8..eebc3ed 100644
--- a/azure-pipelines/nightly.yml
+++ b/azure-pipelines/nightly.yml
@@ -79,7 +79,7 @@ jobs:
displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted
steps:
- - template: powershell.yml
+ - template: bash.yml
parameters:
environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 Win64
@@ -90,7 +90,7 @@ jobs:
displayName: 'Windows (x86; Visual Studio)'
pool: Hosted
steps:
- - template: powershell.yml
+ - template: bash.yml
parameters:
environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013
@@ -106,7 +106,7 @@ jobs:
env:
TEMP: $(Agent.TempDirectory)
ARCH: amd64
- - template: powershell.yml
+ - template: bash.yml
parameters:
environmentVariables:
BUILD_PATH: $(Agent.TempDirectory)\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
@@ -124,7 +124,7 @@ jobs:
env:
TEMP: $(Agent.TempDirectory)
ARCH: x86
- - template: powershell.yml
+ - template: bash.yml
parameters:
environmentVariables:
BUILD_PATH: $(Agent.TempDirectory)\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
diff --git a/azure-pipelines/powershell.yml b/azure-pipelines/powershell.yml
deleted file mode 100644
index 96da4ea..0000000
--- a/azure-pipelines/powershell.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# These are the steps used for building on machines with PowerShell.
-steps:
-- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\build.ps1'
- displayName: Build
- workingDirectory: '$(Build.BinariesDirectory)'
- env: ${{ parameters.environmentVariables }}
-- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\test.ps1'
- displayName: Test
- workingDirectory: '$(Build.BinariesDirectory)'
- env: ${{ parameters.environmentVariables }}
-- task: PublishTestResults@2
- displayName: Publish Test Results
- condition: succeededOrFailed()
- inputs:
- testResultsFiles: 'results_*.xml'
- searchFolder: '$(Build.BinariesDirectory)'
- mergeTestResults: true
diff --git a/azure-pipelines/test.ps1 b/azure-pipelines/test.ps1
deleted file mode 100644
index 0c9e795..0000000
--- a/azure-pipelines/test.ps1
+++ /dev/null
@@ -1,139 +0,0 @@
-Set-StrictMode -Version Latest
-
-$ErrorActionPreference = "Stop"
-$PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
-
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-$SourceDir = Split-Path (Split-Path (Get-Variable MyInvocation).Value.MyCommand.Path)
-$BuildDir = Get-Location
-$global:Success = $true
-
-if ($Env:SKIP_TESTS) { exit }
-
-# Ask ctest what it would run if we were to invoke it directly. This lets
-# us manage the test configuration in a single place (tests/CMakeLists.txt)
-# instead of running clar here as well. But it allows us to wrap our test
-# harness with a leak checker like valgrind. Append the option to write
-# JUnit-style XML files.
-function run_test {
- $TestName = $args[0]
-
- $TestCommand = (ctest -N -V -R "^$TestName$") -join "`n"
-
- if (-Not ($TestCommand -match "(?ms).*\n^[0-9]*: Test command: ")) {
- echo "Could not find tests: $TestName"
- exit
- }
-
- $TestCommand = (ctest -N -V -R "^$TestName$") -join "`n" -replace "(?ms).*\n^[0-9]*: Test command: ","" -replace "\n.*",""
- $TestCommand += " -r${BuildDir}\results_${TestName}.xml"
-
- if ($Env:GITTEST_FLAKY_RETRY -gt 0) {
- $AttemptsRemain = $Env:GITTEST_FLAKY_RETRY
- } else {
- $AttemptsRemain = 1
- }
-
- $Failed = 0
- while ($AttemptsRemain -ne 0) {
- if ($Failed -eq 1) {
- Write-Host ""
- Write-Host "Re-running flaky $TestName tests..."
- Write-Host ""
- }
-
- Invoke-Expression $TestCommand
- if ($LastExitCode -eq 0) {
- $Failed = 0
- break
- } else {
- $Failed = 1
- }
-
- $AttemptsRemain = $AttemptsRemain - 1
- }
-
- if ($Failed -eq 1) { $global:Success = $false }
-}
-
-Write-Host "##############################################################################"
-Write-Host "## Configuring test environment"
-Write-Host "##############################################################################"
-
-if (-not $Env:SKIP_PROXY_TESTS) {
- Invoke-WebRequest -Method GET -Uri https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar -OutFile poxyproxy.jar
-
- Write-Host ""
- Write-Host "Starting HTTP proxy (Basic)..."
- javaw -jar poxyproxy.jar --port 8080 --credentials foo:bar --auth-type basic --quiet
-
- Write-Host ""
- Write-Host "Starting HTTP proxy (NTLM)..."
- javaw -jar poxyproxy.jar --port 8090 --credentials foo:bar --auth-type ntlm --quiet
-}
-
-if (-not $Env:SKIP_OFFLINE_TESTS) {
- Write-Host ""
- Write-Host "##############################################################################"
- Write-Host "## Running (offline) tests"
- Write-Host "##############################################################################"
-
- run_test offline
-}
-
-if ($Env:RUN_INVASIVE_TESTS) {
- Write-Host ""
- Write-Host "##############################################################################"
- Write-Host "## Running (invasive) tests"
- Write-Host "##############################################################################"
-
- $Env:GITTEST_INVASIVE_FS_SIZE=1
- $Env:GITTEST_INVASIVE_MEMORY=1
- $Env:GITTEST_INVASIVE_SPEED=1
- run_test invasive
- $Env:GITTEST_INVASIVE_FS_SIZE=$null
- $Env:GITTEST_INVASIVE_MEMORY=$null
- $Env:GITTEST_INVASIVE_SPEED=$null
-}
-
-if (-not $Env:SKIP_ONLINE_TESTS) {
- Write-Host ""
- Write-Host "##############################################################################"
- Write-Host "## Running (online) tests"
- Write-Host "##############################################################################"
-
- $Env:GITTEST_FLAKY_RETRY=5
- run_test online
- $Env:GITTEST_FLAKY_RETRY=0
-}
-
-if (-not $Env:SKIP_PROXY_TESTS) {
- # Test HTTP Basic authentication
- Write-Host ""
- Write-Host "Running proxy tests (Basic authentication)"
- Write-Host ""
-
- $Env:GITTEST_REMOTE_PROXY_HOST="localhost:8080"
- $Env:GITTEST_REMOTE_PROXY_USER="foo"
- $Env:GITTEST_REMOTE_PROXY_PASS="bar"
- run_test proxy
-
- # Test NTLM authentication
- Write-Host ""
- Write-Host "Running proxy tests (NTLM authentication)"
- Write-Host ""
-
- $Env:GITTEST_REMOTE_PROXY_HOST="localhost:8090"
- $Env:GITTEST_REMOTE_PROXY_USER="foo"
- $Env:GITTEST_REMOTE_PROXY_PASS="bar"
- run_test proxy
-
- $Env:GITTEST_REMOTE_PROXY_HOST=$null
- $Env:GITTEST_REMOTE_PROXY_USER=$null
- $Env:GITTEST_REMOTE_PROXY_PASS=$null
-
- taskkill /F /IM javaw.exe
-}
-
-if (-Not $global:Success) { exit 1 }