From 0897cf37e7a98b8b68d735722c7141460caaecaa Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 18 Sep 2018 13:35:25 +1000 Subject: ci: rename vsts to azure-pipelines --- .vsts-ci.yml | 101 ------------------------------------------------- .vsts-nightly.yml | 22 ----------- azure-pipelines.yml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ ci/bash.yml | 17 +++++++++ ci/docker.yml | 33 ++++++++++++++++ ci/nightly.yml | 22 +++++++++++ ci/powershell.yml | 17 +++++++++ ci/vsts-bash.yml | 17 --------- ci/vsts-docker.yml | 33 ---------------- ci/vsts-powershell.yml | 17 --------- 10 files changed, 190 insertions(+), 190 deletions(-) delete mode 100644 .vsts-ci.yml delete mode 100644 .vsts-nightly.yml create mode 100644 azure-pipelines.yml create mode 100644 ci/bash.yml create mode 100644 ci/docker.yml create mode 100644 ci/nightly.yml create mode 100644 ci/powershell.yml delete mode 100644 ci/vsts-bash.yml delete mode 100644 ci/vsts-docker.yml delete mode 100644 ci/vsts-powershell.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml deleted file mode 100644 index 6788e0d8f..000000000 --- a/.vsts-ci.yml +++ /dev/null @@ -1,101 +0,0 @@ -resources: -- repo: self - -trigger: -- master -- maint/* - -phases: -- phase: linux_trusty_gcc_openssl - displayName: 'Linux (Trusty; GCC; OpenSSL)' - queue: - name: 'Hosted Linux Preview' - steps: - - template: ci/vsts-docker.yml - parameters: - imageName: 'libgit2/trusty-openssl:latest' - environmentVariables: | - CC=gcc - LEAK_CHECK=valgrind - -- phase: linux_trusty_clang_openssl - displayName: 'Linux (Trusty; Clang; OpenSSL)' - queue: - name: 'Hosted Linux Preview' - steps: - - template: ci/vsts-docker.yml - parameters: - imageName: 'libgit2/trusty-openssl:latest' - environmentVariables: | - CC=clang - LEAK_CHECK=valgrind - workDir: '/build' - containerCommand: '/src/ci/test.sh' - detached: false - -- phase: macos - displayName: 'macOS' - queue: - name: 'Hosted macOS Preview' - steps: - - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' - displayName: Setup - - template: ci/vsts-bash.yml - parameters: - environmentVariables: - TMPDIR: $(Agent.TempDirectory) - PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig - LEAK_CHECK: leaks - -- phase: windows_vs_amd64 - displayName: 'Windows (Visual Studio; amd64)' - queue: - name: Hosted - steps: - - template: ci/vsts-powershell.yml - parameters: - environmentVariables: - CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" - -- phase: windows_vs_x86 - displayName: 'Windows (Visual Studio; x86)' - queue: - name: Hosted - steps: - - template: ci/vsts-powershell.yml - parameters: - environmentVariables: - CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" - -- phase: windows_mingw_amd64 - displayName: 'Windows (MinGW; amd64)' - queue: - name: Hosted - steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - displayName: Setup - env: - TEMP: $(Agent.TempDirectory) - ARCH: amd64 - - template: ci/vsts-powershell.yml - parameters: - environmentVariables: - 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 - -- phase: windows_mingw_x86 - displayName: 'Windows (MinGW; x86)' - queue: - name: Hosted - steps: - - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' - displayName: Setup - workingDirectory: '$(Build.BinariesDirectory)' - env: - TEMP: $(Agent.TempDirectory) - ARCH: x86 - - template: ci/vsts-powershell.yml - parameters: - environmentVariables: - 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 diff --git a/.vsts-nightly.yml b/.vsts-nightly.yml deleted file mode 100644 index 6c5d0ebb4..000000000 --- a/.vsts-nightly.yml +++ /dev/null @@ -1,22 +0,0 @@ -resources: -- repo: self - -phases: -- phase: coverity - displayName: 'Coverity' - queue: - name: 'Hosted Linux Preview' - steps: - - task: Docker@0 - displayName: Build - inputs: - action: 'Run an image' - imageName: 'libgit2/trusty-openssl:latest' - volumes: | - $(Build.SourcesDirectory):/src - $(Build.BinariesDirectory):/build - envVars: | - COVERITY_TOKEN=$(COVERITY_TOKEN) - workDir: '/build' - containerCommand: '/src/ci/coverity.sh' - detached: false diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..5844270c2 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,101 @@ +resources: +- repo: self + +trigger: +- master +- maint/* + +phases: +- phase: linux_trusty_gcc_openssl + displayName: 'Linux (Trusty; GCC; OpenSSL)' + queue: + name: 'Hosted Linux Preview' + steps: + - template: ci/docker.yml + parameters: + imageName: 'libgit2/trusty-openssl:latest' + environmentVariables: | + CC=gcc + LEAK_CHECK=valgrind + +- phase: linux_trusty_clang_openssl + displayName: 'Linux (Trusty; Clang; OpenSSL)' + queue: + name: 'Hosted Linux Preview' + steps: + - template: ci/docker.yml + parameters: + imageName: 'libgit2/trusty-openssl:latest' + environmentVariables: | + CC=clang + LEAK_CHECK=valgrind + workDir: '/build' + containerCommand: '/src/ci/test.sh' + detached: false + +- phase: macos + displayName: 'macOS' + queue: + name: 'Hosted macOS Preview' + steps: + - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh' + displayName: Setup + - template: ci/bash.yml + parameters: + environmentVariables: + TMPDIR: $(Agent.TempDirectory) + PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig + LEAK_CHECK: leaks + +- phase: windows_vs_amd64 + displayName: 'Windows (Visual Studio; amd64)' + queue: + name: Hosted + steps: + - template: ci/powershell.yml + parameters: + environmentVariables: + CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" + +- phase: windows_vs_x86 + displayName: 'Windows (Visual Studio; x86)' + queue: + name: Hosted + steps: + - template: ci/powershell.yml + parameters: + environmentVariables: + CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" + +- phase: windows_mingw_amd64 + displayName: 'Windows (MinGW; amd64)' + queue: + name: Hosted + steps: + - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' + displayName: Setup + env: + TEMP: $(Agent.TempDirectory) + ARCH: amd64 + - template: ci/powershell.yml + parameters: + environmentVariables: + 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 + +- phase: windows_mingw_x86 + displayName: 'Windows (MinGW; x86)' + queue: + name: Hosted + steps: + - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1' + displayName: Setup + workingDirectory: '$(Build.BinariesDirectory)' + env: + TEMP: $(Agent.TempDirectory) + ARCH: x86 + - template: ci/powershell.yml + parameters: + environmentVariables: + 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 diff --git a/ci/bash.yml b/ci/bash.yml new file mode 100644 index 000000000..d776a3649 --- /dev/null +++ b/ci/bash.yml @@ -0,0 +1,17 @@ +# These are the steps used for building on machines with bash. +steps: +- bash: . '$(Build.SourcesDirectory)/ci/build.sh' + displayName: Build + workingDirectory: '$(Build.BinariesDirectory)' + env: ${{ parameters.environmentVariables }} +- bash: . '$(Build.SourcesDirectory)/ci/test.sh' + displayName: Test + workingDirectory: '$(Build.BinariesDirectory)' + env: ${{ parameters.environmentVariables }} +- task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + inputs: + testResultsFiles: 'results_*.xml' + searchFolder: '$(Build.BinariesDirectory)' + mergeTestResults: true diff --git a/ci/docker.yml b/ci/docker.yml new file mode 100644 index 000000000..e92510478 --- /dev/null +++ b/ci/docker.yml @@ -0,0 +1,33 @@ +# These are the steps used in a container-based build in VSTS. +steps: +- task: docker@0 + displayName: Build + inputs: + action: 'Run an image' + imageName: ${{ parameters.imageName }} + volumes: | + $(Build.SourcesDirectory):/src + $(Build.BinariesDirectory):/build + envVars: ${{ parameters.environmentVariables }} + workDir: '/build' + containerCommand: '/src/ci/build.sh' + detached: false +- task: docker@0 + displayName: Test + inputs: + action: 'Run an image' + imageName: ${{ parameters.imageName }} + volumes: | + $(Build.SourcesDirectory):/src + $(Build.BinariesDirectory):/build + envVars: ${{ parameters.environmentVariables }} + workDir: '/build' + containerCommand: '/src/ci/test.sh' + detached: false +- task: publishtestresults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + inputs: + testResultsFiles: 'results_*.xml' + searchFolder: '$(Build.BinariesDirectory)' + mergeTestResults: true diff --git a/ci/nightly.yml b/ci/nightly.yml new file mode 100644 index 000000000..6c5d0ebb4 --- /dev/null +++ b/ci/nightly.yml @@ -0,0 +1,22 @@ +resources: +- repo: self + +phases: +- phase: coverity + displayName: 'Coverity' + queue: + name: 'Hosted Linux Preview' + steps: + - task: Docker@0 + displayName: Build + inputs: + action: 'Run an image' + imageName: 'libgit2/trusty-openssl:latest' + volumes: | + $(Build.SourcesDirectory):/src + $(Build.BinariesDirectory):/build + envVars: | + COVERITY_TOKEN=$(COVERITY_TOKEN) + workDir: '/build' + containerCommand: '/src/ci/coverity.sh' + detached: false diff --git a/ci/powershell.yml b/ci/powershell.yml new file mode 100644 index 000000000..a2eb175d5 --- /dev/null +++ b/ci/powershell.yml @@ -0,0 +1,17 @@ +# These are the steps used for building on machines with PowerShell. +steps: +- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' + displayName: Build + workingDirectory: '$(Build.BinariesDirectory)' + env: ${{ parameters.environmentVariables }} +- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1' + displayName: Test + workingDirectory: '$(Build.BinariesDirectory)' + env: ${{ parameters.environmentVariables }} +- task: PublishTestResults@2 + displayName: Publish Test Results + condition: succeededOrFailed() + inputs: + testResultsFiles: 'results_*.xml' + searchFolder: '$(Build.BinariesDirectory)' + mergeTestResults: true diff --git a/ci/vsts-bash.yml b/ci/vsts-bash.yml deleted file mode 100644 index d776a3649..000000000 --- a/ci/vsts-bash.yml +++ /dev/null @@ -1,17 +0,0 @@ -# These are the steps used for building on machines with bash. -steps: -- bash: . '$(Build.SourcesDirectory)/ci/build.sh' - displayName: Build - workingDirectory: '$(Build.BinariesDirectory)' - env: ${{ parameters.environmentVariables }} -- bash: . '$(Build.SourcesDirectory)/ci/test.sh' - displayName: Test - workingDirectory: '$(Build.BinariesDirectory)' - env: ${{ parameters.environmentVariables }} -- task: PublishTestResults@2 - displayName: Publish Test Results - condition: succeededOrFailed() - inputs: - testResultsFiles: 'results_*.xml' - searchFolder: '$(Build.BinariesDirectory)' - mergeTestResults: true diff --git a/ci/vsts-docker.yml b/ci/vsts-docker.yml deleted file mode 100644 index e92510478..000000000 --- a/ci/vsts-docker.yml +++ /dev/null @@ -1,33 +0,0 @@ -# These are the steps used in a container-based build in VSTS. -steps: -- task: docker@0 - displayName: Build - inputs: - action: 'Run an image' - imageName: ${{ parameters.imageName }} - volumes: | - $(Build.SourcesDirectory):/src - $(Build.BinariesDirectory):/build - envVars: ${{ parameters.environmentVariables }} - workDir: '/build' - containerCommand: '/src/ci/build.sh' - detached: false -- task: docker@0 - displayName: Test - inputs: - action: 'Run an image' - imageName: ${{ parameters.imageName }} - volumes: | - $(Build.SourcesDirectory):/src - $(Build.BinariesDirectory):/build - envVars: ${{ parameters.environmentVariables }} - workDir: '/build' - containerCommand: '/src/ci/test.sh' - detached: false -- task: publishtestresults@2 - displayName: Publish Test Results - condition: succeededOrFailed() - inputs: - testResultsFiles: 'results_*.xml' - searchFolder: '$(Build.BinariesDirectory)' - mergeTestResults: true diff --git a/ci/vsts-powershell.yml b/ci/vsts-powershell.yml deleted file mode 100644 index a2eb175d5..000000000 --- a/ci/vsts-powershell.yml +++ /dev/null @@ -1,17 +0,0 @@ -# These are the steps used for building on machines with PowerShell. -steps: -- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1' - displayName: Build - workingDirectory: '$(Build.BinariesDirectory)' - env: ${{ parameters.environmentVariables }} -- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1' - displayName: Test - workingDirectory: '$(Build.BinariesDirectory)' - env: ${{ parameters.environmentVariables }} -- task: PublishTestResults@2 - displayName: Publish Test Results - condition: succeededOrFailed() - inputs: - testResultsFiles: 'results_*.xml' - searchFolder: '$(Build.BinariesDirectory)' - mergeTestResults: true -- cgit v1.2.1