From: Johannes Schindelin <johannes.schindelin@xxxxxx>
The Windows job currently takes a whopping ~1h20m to complete. Which is
*far* longer than the next-longest job takes (linux-gcc, ~35m). As such,
it makes sense to start the Windows job first, to minimize the overall
run time (which is now pretty safely the run time of the Windows job).
This affects only the Azure Pipelines configuration, not the Travis one,
of course, as Travis cannot run our Windows job: 1h20m is distinctly
longer than the 50 minute timeout of Travis' free tier.
This commit is best viewed with `--color-moved`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
azure-pipelines.yml | 172 ++++++++++++++++++++++----------------------
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f3cabb0dd0..e44d2733a4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,6 +3,92 @@ resources:
fetchDepth: 1
jobs:
+- job: windows
+ displayName: Windows
+ condition: succeeded()
+ pool: Hosted
+ timeoutInMinutes: 240
+ steps:
+ - powershell: |
+ if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
+ net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
+ cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
+ }
+ displayName: 'Mount test-cache'
+ env:
+ GITFILESHAREPWD: $(gitfileshare.pwd)
+ - powershell: |
+ # Helper to check the error level of the latest command (exit with error when appropriate)
+ function c() { if (!$?) { exit(1) } }
+
+ # Add build agent's MinGit to PATH
+ $env:PATH = $env:AGENT_HOMEDIRECTORY +"\externals\\git\cmd;" +$env:PATH
+
+ # Helper to initialize (or update) a Git worktree
+ function init ($path, $url, $set_origin) {
+ if (Test-Path $path) {
+ cd $path; c
+ if (Test-Path .git) {
+ & git init; c
+ } else {
+ & git status
+ }
+ } else {
+ & git init $path; c
+ cd $path; c
+ }
+ & git config core.autocrlf false; c
+ & git config core.untrackedCache true; c
+ if (($set_origin -ne 0) -and !(git config remote.origin.url)) {
+ & git remote add origin $url; c
+ }
+ & git fetch --depth=1 $url master; c
+ & git reset --hard FETCH_HEAD; c
+ & git clean -df; c
+ }
+
+ # Initialize Git for Windows' SDK
+ $sdk_path = "$(Build.SourcesDirectory)\git-sdk-64"
+ init "$sdk_path" "https://dev.azure.com/git-for-windows/git-sdk-64/_git/git-sdk-64"; 0
+
+ # Let Git ignore the SDK and the test-cache
+ "/git-sdk-64/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
+ displayName: 'Initialize the Git for Windows SDK'
+ - powershell: |
+ & "git-sdk-64\git-cmd.exe" --command=usr\\bin\\bash.exe -lc @"
+ export MAKEFLAGS=-j10
+ export DEVELOPER=1
+ export NO_PERL=1
+ export NO_SVN_TESTS=1
+ export GIT_TEST_SKIP_REBASE_P=1
+
+ ci/run-build-and-tests.sh || {
+ ci/print-test-failures.sh
+ exit 1
+ }
+ "@
+ if (!$?) { exit(1) }
+ displayName: 'Build & Test'
+ env:
+ HOME: $(Build.SourcesDirectory)
+ MSYSTEM: MINGW64
+ - powershell: |
+ if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
+ cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
+ }
+ displayName: 'Unmount test-cache'
+ condition: true
+ env:
+ GITFILESHAREPWD: $(gitfileshare.pwd)
+ - task: PublishTestResults@2
+ displayName: 'Publish Test Results **/TEST-*.xml'
+ inputs:
+ mergeTestResults: true
+ testRunTitle: 'windows'
+ platform: Windows
+ publishRunAttachments: false
+ condition: succeededOrFailed()
+
- job: linux_clang
displayName: linux-clang
condition: succeeded()
@@ -153,92 +239,6 @@ jobs:
publishRunAttachments: false
condition: succeededOrFailed()
-- job: windows
- displayName: Windows
- condition: succeeded()
- pool: Hosted
- timeoutInMinutes: 240
- steps:
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
- cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
- }
- displayName: 'Mount test-cache'
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - powershell: |
- # Helper to check the error level of the latest command (exit with error when appropriate)
- function c() { if (!$?) { exit(1) } }
-
- # Add build agent's MinGit to PATH
- $env:PATH = $env:AGENT_HOMEDIRECTORY +"\externals\\git\cmd;" +$env:PATH
-
- # Helper to initialize (or update) a Git worktree
- function init ($path, $url, $set_origin) {
- if (Test-Path $path) {
- cd $path; c
- if (Test-Path .git) {
- & git init; c
- } else {
- & git status
- }
- } else {
- & git init $path; c
- cd $path; c
- }
- & git config core.autocrlf false; c
- & git config core.untrackedCache true; c
- if (($set_origin -ne 0) -and !(git config remote.origin.url)) {
- & git remote add origin $url; c
- }
- & git fetch --depth=1 $url master; c
- & git reset --hard FETCH_HEAD; c
- & git clean -df; c
- }
-
- # Initialize Git for Windows' SDK
- $sdk_path = "$(Build.SourcesDirectory)\git-sdk-64"
- init "$sdk_path" "https://dev.azure.com/git-for-windows/git-sdk-64/_git/git-sdk-64"; 0
-
- # Let Git ignore the SDK and the test-cache
- "/git-sdk-64/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
- displayName: 'Initialize the Git for Windows SDK'
- - powershell: |
- & "git-sdk-64\git-cmd.exe" --command=usr\\bin\\bash.exe -lc @"
- export MAKEFLAGS=-j10
- export DEVELOPER=1
- export NO_PERL=1
- export NO_SVN_TESTS=1
- export GIT_TEST_SKIP_REBASE_P=1
-
- ci/run-build-and-tests.sh || {
- ci/print-test-failures.sh
- exit 1
- }
- "@
- if (!$?) { exit(1) }
- displayName: 'Build & Test'
- env:
- HOME: $(Build.SourcesDirectory)
- MSYSTEM: MINGW64
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
- }
- displayName: 'Unmount test-cache'
- condition: true
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - task: PublishTestResults@2
- displayName: 'Publish Test Results **/TEST-*.xml'
- inputs:
- mergeTestResults: true
- testRunTitle: 'windows'
- platform: Windows
- publishRunAttachments: false
- condition: succeededOrFailed()
-
- job: linux32
displayName: Linux32
condition: succeeded()
--
gitgitgadget
