Commit b974a94fbf2fa8c0195d3e51c08a2ec209818f52
2018-08-26T17:27:54
ci: explicitly run in the build directory Explicitly run from the build directory, not the source. (I was mistaken about the default working directory for VSTS agents.) (cherry picked from commit 306875bc1c0c4cf82a4feb9436d161750c3f0aad)
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
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 198236f..4501b66 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -89,12 +89,15 @@ jobs:
steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
+ workingDirectory: '$(Build.BinariesDirectory)'
- bash: . '$(Build.SourcesDirectory)/ci/build.sh'
displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
- bash: . '$(Build.SourcesDirectory)/ci/test.sh'
displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
TMPDIR: $(Agent.TempDirectory)
LEAK_CHECK: leaks
@@ -112,10 +115,12 @@ jobs:
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64"
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
@@ -130,10 +135,12 @@ jobs:
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013"
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
@@ -148,16 +155,19 @@ jobs:
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
TEMP: $(Agent.TempDirectory)
ARCH: amd64
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
CMAKE_OPTIONS: -G"MinGW Makefiles"
PATH: $(Agent.TempDirectory)\mingw64\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
@@ -172,16 +182,19 @@ jobs:
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
TEMP: $(Agent.TempDirectory)
ARCH: x86
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
env:
CMAKE_OPTIONS: -G"MinGW Makefiles"
PATH: $(Agent.TempDirectory)\mingw32\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()