From ffac520e8301ed83fb229dec7393898bf00df423 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 24 Jun 2019 16:19:35 +0200 Subject: [PATCH] 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. --- azure-pipelines.yml | 6 +++--- azure-pipelines/bash.yml | 4 ++-- {ci => azure-pipelines}/build.ps1 | 0 {ci => azure-pipelines}/build.sh | 0 {ci => azure-pipelines}/coverity-build.sh | 0 {ci => azure-pipelines}/coverity-publish.sh | 0 azure-pipelines/coverity.yml | 4 ++-- azure-pipelines/docker.yml | 4 ++-- azure-pipelines/nightly.yml | 6 +++--- azure-pipelines/powershell.yml | 4 ++-- {ci => azure-pipelines}/setup-linux.sh | 0 {ci => azure-pipelines}/setup-mingw.ps1 | 0 {ci => azure-pipelines}/setup-osx.sh | 0 {ci => azure-pipelines}/test.ps1 | 0 {ci => azure-pipelines}/test.sh | 0 15 files changed, 14 insertions(+), 14 deletions(-) rename {ci => azure-pipelines}/build.ps1 (100%) rename {ci => azure-pipelines}/build.sh (100%) rename {ci => azure-pipelines}/coverity-build.sh (100%) rename {ci => azure-pipelines}/coverity-publish.sh (100%) rename {ci => azure-pipelines}/setup-linux.sh (100%) rename {ci => azure-pipelines}/setup-mingw.ps1 (100%) rename {ci => azure-pipelines}/setup-osx.sh (100%) rename {ci => azure-pipelines}/test.ps1 (100%) rename {ci => azure-pipelines}/test.sh (100%) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0f92df38c..397e377ff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -59,7 +59,7 @@ jobs: pool: vmImage: 'macOS 10.13' steps: - - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' + - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh' displayName: Setup - template: azure-pipelines/bash.yml parameters: @@ -91,7 +91,7 @@ jobs: displayName: 'Windows (amd64; MinGW)' pool: Hosted steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' + - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1' displayName: Setup env: TEMP: $(Agent.TempDirectory) @@ -106,7 +106,7 @@ jobs: displayName: 'Windows (x86; MinGW)' pool: Hosted steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' + - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1' displayName: Setup workingDirectory: '$(Build.BinariesDirectory)' env: diff --git a/azure-pipelines/bash.yml b/azure-pipelines/bash.yml index d776a3649..33a442b57 100644 --- a/azure-pipelines/bash.yml +++ b/azure-pipelines/bash.yml @@ -1,10 +1,10 @@ # These are the steps used for building on machines with bash. steps: -- bash: . '$(Build.SourcesDirectory)/ci/build.sh' +- bash: . '$(Build.SourcesDirectory)/azure-pipelines/build.sh' displayName: Build workingDirectory: '$(Build.BinariesDirectory)' env: ${{ parameters.environmentVariables }} -- bash: . '$(Build.SourcesDirectory)/ci/test.sh' +- bash: . '$(Build.SourcesDirectory)/azure-pipelines/test.sh' displayName: Test workingDirectory: '$(Build.BinariesDirectory)' env: ${{ parameters.environmentVariables }} diff --git a/ci/build.ps1 b/azure-pipelines/build.ps1 similarity index 100% rename from ci/build.ps1 rename to azure-pipelines/build.ps1 diff --git a/ci/build.sh b/azure-pipelines/build.sh similarity index 100% rename from ci/build.sh rename to azure-pipelines/build.sh diff --git a/ci/coverity-build.sh b/azure-pipelines/coverity-build.sh similarity index 100% rename from ci/coverity-build.sh rename to azure-pipelines/coverity-build.sh diff --git a/ci/coverity-publish.sh b/azure-pipelines/coverity-publish.sh similarity index 100% rename from ci/coverity-publish.sh rename to azure-pipelines/coverity-publish.sh diff --git a/azure-pipelines/coverity.yml b/azure-pipelines/coverity.yml index d8d34229e..d8c6b3f66 100644 --- a/azure-pipelines/coverity.yml +++ b/azure-pipelines/coverity.yml @@ -18,7 +18,7 @@ jobs: envVars: | COVERITY_TOKEN=$(COVERITY_TOKEN) workDir: '/build' - containerCommand: '/src/ci/coverity-build.sh' + containerCommand: '/src/azure-pipelines/coverity-build.sh' detached: false - task: Docker@0 displayName: Publish @@ -31,6 +31,6 @@ jobs: envVars: | COVERITY_TOKEN=$(COVERITY_TOKEN) workDir: '/build' - containerCommand: '/src/ci/coverity-publish.sh' + containerCommand: '/src/azure-pipelines/coverity-publish.sh' detached: false continueOnError: true diff --git a/azure-pipelines/docker.yml b/azure-pipelines/docker.yml index 2744a63ae..2bbe686cd 100644 --- a/azure-pipelines/docker.yml +++ b/azure-pipelines/docker.yml @@ -14,7 +14,7 @@ steps: $(Build.BinariesDirectory):/build envVars: ${{ parameters.environmentVariables }} workDir: '/build' - containerCommand: '/src/ci/build.sh' + containerCommand: '/src/azure-pipelines/build.sh' detached: false - task: docker@0 displayName: Test @@ -26,7 +26,7 @@ steps: $(Build.BinariesDirectory):/build envVars: ${{ parameters.environmentVariables }} workDir: '/build' - containerCommand: '/src/ci/test.sh' + containerCommand: '/src/azure-pipelines/test.sh' detached: false - task: publishtestresults@2 displayName: Publish Test Results diff --git a/azure-pipelines/nightly.yml b/azure-pipelines/nightly.yml index a79e92680..8b2868f1c 100644 --- a/azure-pipelines/nightly.yml +++ b/azure-pipelines/nightly.yml @@ -59,7 +59,7 @@ jobs: pool: vmImage: 'macOS 10.13' steps: - - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' + - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh' displayName: Setup - template: bash.yml parameters: @@ -94,7 +94,7 @@ jobs: displayName: 'Windows (amd64; MinGW)' pool: Hosted steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' + - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1' displayName: Setup env: TEMP: $(Agent.TempDirectory) @@ -110,7 +110,7 @@ jobs: displayName: 'Windows (x86; MinGW)' pool: Hosted steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' + - powershell: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.ps1' displayName: Setup workingDirectory: '$(Build.BinariesDirectory)' env: diff --git a/azure-pipelines/powershell.yml b/azure-pipelines/powershell.yml index a2eb175d5..96da4eaaa 100644 --- a/azure-pipelines/powershell.yml +++ b/azure-pipelines/powershell.yml @@ -1,10 +1,10 @@ # These are the steps used for building on machines with PowerShell. steps: -- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' +- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\build.ps1' displayName: Build workingDirectory: '$(Build.BinariesDirectory)' env: ${{ parameters.environmentVariables }} -- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1' +- powershell: . '$(Build.SourcesDirectory)\azure-pipelines\test.ps1' displayName: Test workingDirectory: '$(Build.BinariesDirectory)' env: ${{ parameters.environmentVariables }} diff --git a/ci/setup-linux.sh b/azure-pipelines/setup-linux.sh similarity index 100% rename from ci/setup-linux.sh rename to azure-pipelines/setup-linux.sh diff --git a/ci/setup-mingw.ps1 b/azure-pipelines/setup-mingw.ps1 similarity index 100% rename from ci/setup-mingw.ps1 rename to azure-pipelines/setup-mingw.ps1 diff --git a/ci/setup-osx.sh b/azure-pipelines/setup-osx.sh similarity index 100% rename from ci/setup-osx.sh rename to azure-pipelines/setup-osx.sh diff --git a/ci/test.ps1 b/azure-pipelines/test.ps1 similarity index 100% rename from ci/test.ps1 rename to azure-pipelines/test.ps1 diff --git a/ci/test.sh b/azure-pipelines/test.sh similarity index 100% rename from ci/test.sh rename to azure-pipelines/test.sh