Commit 306875bc by Edward Thomson

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.)
parent f3f2c45e
...@@ -169,12 +169,15 @@ jobs: ...@@ -169,12 +169,15 @@ jobs:
steps: steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup displayName: Setup
workingDirectory: '$(Build.BinariesDirectory)'
- bash: . '$(Build.SourcesDirectory)/ci/build.sh' - bash: . '$(Build.SourcesDirectory)/ci/build.sh'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
- bash: . '$(Build.SourcesDirectory)/ci/test.sh' - bash: . '$(Build.SourcesDirectory)/ci/test.sh'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
TMPDIR: $(Agent.TempDirectory) TMPDIR: $(Agent.TempDirectory)
LEAK_CHECK: leaks LEAK_CHECK: leaks
...@@ -192,10 +195,12 @@ jobs: ...@@ -192,10 +195,12 @@ jobs:
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64"
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish Test Results displayName: Publish Test Results
condition: succeededOrFailed() condition: succeededOrFailed()
...@@ -210,10 +215,12 @@ jobs: ...@@ -210,10 +215,12 @@ jobs:
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013"
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish Test Results displayName: Publish Test Results
condition: succeededOrFailed() condition: succeededOrFailed()
...@@ -228,16 +235,19 @@ jobs: ...@@ -228,16 +235,19 @@ jobs:
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup displayName: Setup
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
TEMP: $(Agent.TempDirectory) TEMP: $(Agent.TempDirectory)
ARCH: amd64 ARCH: amd64
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
CMAKE_OPTIONS: -G"MinGW Makefiles" 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 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' - powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish Test Results displayName: Publish Test Results
condition: succeededOrFailed() condition: succeededOrFailed()
...@@ -252,16 +262,19 @@ jobs: ...@@ -252,16 +262,19 @@ jobs:
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup displayName: Setup
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
TEMP: $(Agent.TempDirectory) TEMP: $(Agent.TempDirectory)
ARCH: x86 ARCH: x86
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' - powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)'
env: env:
CMAKE_OPTIONS: -G"MinGW Makefiles" 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 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' - powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)'
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish Test Results displayName: Publish Test Results
condition: succeededOrFailed() condition: succeededOrFailed()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment