Commit ffac520e by Patrick Steinhardt

azure: move build scripts into "azure-pipelines" directory

Since we have migrated to Azure Pipelines, we have deprecated and
subsequentally removed all infrastructure for AppVeyor and
Travis. Thus it doesn't make a lot of sense to have the split
between "ci/" and "azure-pipelines/" directories anymoer, as
"azure-pipelines/" is essentially our only CI.

Move all CI scripts into the "azure-pipelines/" directory to have
everything centrally located and to remove clutter in the
top-level directory.
parent d827b11b
...@@ -59,7 +59,7 @@ jobs: ...@@ -59,7 +59,7 @@ jobs:
pool: pool:
vmImage: 'macOS 10.13' vmImage: 'macOS 10.13'
steps: steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
displayName: Setup displayName: Setup
- template: azure-pipelines/bash.yml - template: azure-pipelines/bash.yml
parameters: parameters:
...@@ -91,7 +91,7 @@ jobs: ...@@ -91,7 +91,7 @@ jobs:
displayName: 'Windows (amd64; MinGW)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool: Hosted
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
displayName: Setup displayName: Setup
env: env:
TEMP: $(Agent.TempDirectory) TEMP: $(Agent.TempDirectory)
...@@ -106,7 +106,7 @@ jobs: ...@@ -106,7 +106,7 @@ jobs:
displayName: 'Windows (x86; MinGW)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool: Hosted
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
displayName: Setup displayName: Setup
workingDirectory: '$(Build.BinariesDirectory)' workingDirectory: '$(Build.BinariesDirectory)'
env: env:
......
# These are the steps used for building on machines with bash. # These are the steps used for building on machines with bash.
steps: steps:
- bash: . '$(Build.SourcesDirectory)/ci/build.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/build.sh'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)' workingDirectory: '$(Build.BinariesDirectory)'
env: ${{ parameters.environmentVariables }} env: ${{ parameters.environmentVariables }}
- bash: . '$(Build.SourcesDirectory)/ci/test.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/test.sh'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)' workingDirectory: '$(Build.BinariesDirectory)'
env: ${{ parameters.environmentVariables }} env: ${{ parameters.environmentVariables }}
......
...@@ -18,7 +18,7 @@ jobs: ...@@ -18,7 +18,7 @@ jobs:
envVars: | envVars: |
COVERITY_TOKEN=$(COVERITY_TOKEN) COVERITY_TOKEN=$(COVERITY_TOKEN)
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/coverity-build.sh' containerCommand: '/src/azure-pipelines/coverity-build.sh'
detached: false detached: false
- task: Docker@0 - task: Docker@0
displayName: Publish displayName: Publish
...@@ -31,6 +31,6 @@ jobs: ...@@ -31,6 +31,6 @@ jobs:
envVars: | envVars: |
COVERITY_TOKEN=$(COVERITY_TOKEN) COVERITY_TOKEN=$(COVERITY_TOKEN)
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/coverity-publish.sh' containerCommand: '/src/azure-pipelines/coverity-publish.sh'
detached: false detached: false
continueOnError: true continueOnError: true
...@@ -14,7 +14,7 @@ steps: ...@@ -14,7 +14,7 @@ steps:
$(Build.BinariesDirectory):/build $(Build.BinariesDirectory):/build
envVars: ${{ parameters.environmentVariables }} envVars: ${{ parameters.environmentVariables }}
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/build.sh' containerCommand: '/src/azure-pipelines/build.sh'
detached: false detached: false
- task: docker@0 - task: docker@0
displayName: Test displayName: Test
...@@ -26,7 +26,7 @@ steps: ...@@ -26,7 +26,7 @@ steps:
$(Build.BinariesDirectory):/build $(Build.BinariesDirectory):/build
envVars: ${{ parameters.environmentVariables }} envVars: ${{ parameters.environmentVariables }}
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/test.sh' containerCommand: '/src/azure-pipelines/test.sh'
detached: false detached: false
- task: publishtestresults@2 - task: publishtestresults@2
displayName: Publish Test Results displayName: Publish Test Results
......
...@@ -59,7 +59,7 @@ jobs: ...@@ -59,7 +59,7 @@ jobs:
pool: pool:
vmImage: 'macOS 10.13' vmImage: 'macOS 10.13'
steps: steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
displayName: Setup displayName: Setup
- template: bash.yml - template: bash.yml
parameters: parameters:
...@@ -94,7 +94,7 @@ jobs: ...@@ -94,7 +94,7 @@ jobs:
displayName: 'Windows (amd64; MinGW)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool: Hosted
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
displayName: Setup displayName: Setup
env: env:
TEMP: $(Agent.TempDirectory) TEMP: $(Agent.TempDirectory)
...@@ -110,7 +110,7 @@ jobs: ...@@ -110,7 +110,7 @@ jobs:
displayName: 'Windows (x86; MinGW)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool: Hosted
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
displayName: Setup displayName: Setup
workingDirectory: '$(Build.BinariesDirectory)' workingDirectory: '$(Build.BinariesDirectory)'
env: env:
......
# These are the steps used for building on machines with PowerShell. # These are the steps used for building on machines with PowerShell.
steps: steps:
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\build.ps1'
displayName: Build displayName: Build
workingDirectory: '$(Build.BinariesDirectory)' workingDirectory: '$(Build.BinariesDirectory)'
env: ${{ parameters.environmentVariables }} env: ${{ parameters.environmentVariables }}
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1' - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\test.ps1'
displayName: Test displayName: Test
workingDirectory: '$(Build.BinariesDirectory)' workingDirectory: '$(Build.BinariesDirectory)'
env: ${{ parameters.environmentVariables }} env: ${{ parameters.environmentVariables }}
......
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