Skip to content

Commit ffac520

Browse files
committed
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.
1 parent d827b11 commit ffac520

File tree

15 files changed

+14
-14
lines changed

15 files changed

+14
-14
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
pool:
6060
vmImage: 'macOS 10.13'
6161
steps:
62-
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
62+
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
6363
displayName: Setup
6464
- template: azure-pipelines/bash.yml
6565
parameters:
@@ -91,7 +91,7 @@ jobs:
9191
displayName: 'Windows (amd64; MinGW)'
9292
pool: Hosted
9393
steps:
94-
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
94+
- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
9595
displayName: Setup
9696
env:
9797
TEMP: $(Agent.TempDirectory)
@@ -106,7 +106,7 @@ jobs:
106106
displayName: 'Windows (x86; MinGW)'
107107
pool: Hosted
108108
steps:
109-
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
109+
- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
110110
displayName: Setup
111111
workingDirectory: '$(Build.BinariesDirectory)'
112112
env:

azure-pipelines/bash.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# These are the steps used for building on machines with bash.
22
steps:
3-
- bash: . '$(Build.SourcesDirectory)/ci/build.sh'
3+
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/build.sh'
44
displayName: Build
55
workingDirectory: '$(Build.BinariesDirectory)'
66
env: ${{ parameters.environmentVariables }}
7-
- bash: . '$(Build.SourcesDirectory)/ci/test.sh'
7+
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/test.sh'
88
displayName: Test
99
workingDirectory: '$(Build.BinariesDirectory)'
1010
env: ${{ parameters.environmentVariables }}
File renamed without changes.
File renamed without changes.

azure-pipelines/coverity.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
envVars: |
1919
COVERITY_TOKEN=$(COVERITY_TOKEN)
2020
workDir: '/build'
21-
containerCommand: '/src/ci/coverity-build.sh'
21+
containerCommand: '/src/azure-pipelines/coverity-build.sh'
2222
detached: false
2323
- task: Docker@0
2424
displayName: Publish
@@ -31,6 +31,6 @@ jobs:
3131
envVars: |
3232
COVERITY_TOKEN=$(COVERITY_TOKEN)
3333
workDir: '/build'
34-
containerCommand: '/src/ci/coverity-publish.sh'
34+
containerCommand: '/src/azure-pipelines/coverity-publish.sh'
3535
detached: false
3636
continueOnError: true

azure-pipelines/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
$(Build.BinariesDirectory):/build
1515
envVars: ${{ parameters.environmentVariables }}
1616
workDir: '/build'
17-
containerCommand: '/src/ci/build.sh'
17+
containerCommand: '/src/azure-pipelines/build.sh'
1818
detached: false
1919
- task: docker@0
2020
displayName: Test
@@ -26,7 +26,7 @@ steps:
2626
$(Build.BinariesDirectory):/build
2727
envVars: ${{ parameters.environmentVariables }}
2828
workDir: '/build'
29-
containerCommand: '/src/ci/test.sh'
29+
containerCommand: '/src/azure-pipelines/test.sh'
3030
detached: false
3131
- task: publishtestresults@2
3232
displayName: Publish Test Results

azure-pipelines/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
pool:
6060
vmImage: 'macOS 10.13'
6161
steps:
62-
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
62+
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
6363
displayName: Setup
6464
- template: bash.yml
6565
parameters:
@@ -94,7 +94,7 @@ jobs:
9494
displayName: 'Windows (amd64; MinGW)'
9595
pool: Hosted
9696
steps:
97-
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
97+
- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
9898
displayName: Setup
9999
env:
100100
TEMP: $(Agent.TempDirectory)
@@ -110,7 +110,7 @@ jobs:
110110
displayName: 'Windows (x86; MinGW)'
111111
pool: Hosted
112112
steps:
113-
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
113+
- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1'
114114
displayName: Setup
115115
workingDirectory: '$(Build.BinariesDirectory)'
116116
env:

azure-pipelines/powershell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# These are the steps used for building on machines with PowerShell.
22
steps:
3-
- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
3+
- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\build.ps1'
44
displayName: Build
55
workingDirectory: '$(Build.BinariesDirectory)'
66
env: ${{ parameters.environmentVariables }}
7-
- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
7+
- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\test.ps1'
88
displayName: Test
99
workingDirectory: '$(Build.BinariesDirectory)'
1010
env: ${{ parameters.environmentVariables }}

0 commit comments

Comments
 (0)