Skip to content
Permalink
Browse files

CI Improvements (#109)

* Changing the package output path so all packages go to the same folder.

* Explicitly setting the repo to use 3.0.100-preview7-012821 rather than latest

* Reducing the azure-pipelines file size by using templates

* Updating the azure-pipelines to collection package artifacts

* Setting RuntimeIdentifier for ubuntu again.
  • Loading branch information...
tannergooding committed Aug 10, 2019
1 parent 7c19f8a commit f522f5e64859eda8aaf8ed3b2fd59c1a69624fce
Showing with 109 additions and 87 deletions.
  1. +1 −1 Directory.Build.props
  2. +50 −84 scripts/azure-pipelines.yml
  3. +29 −0 scripts/azure-unix.yml
  4. +27 −0 scripts/azure-windows.yml
  5. +1 −1 scripts/build.ps1
  6. +1 −1 scripts/build.sh
@@ -38,7 +38,7 @@
<Authors>Microsoft and Contributors</Authors>
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
<Company>Microsoft</Company>
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath>
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
<Product>LLVMSharp</Product>
<VersionPrefix>8.0.0</VersionPrefix>
<VersionSuffix>alpha</VersionSuffix>
@@ -5,94 +5,60 @@ pr:
- master

jobs:
- job: windows_debug_x86
pool:
name: Hosted
demands: Cmd
steps:
- task: BatchScript@1
displayName: 'Run scripts/cibuild.cmd'
inputs:
filename: scripts/cibuild.cmd
arguments: '-configuration Debug -architecture x86'
- template: azure-windows.yml
parameters:
name: windows_debug_x86
pool: Hosted
configuration: Debug
architecture: x86

- job: windows_release_x86
pool:
name: Hosted
demands: Cmd
steps:
- task: BatchScript@1
displayName: 'Run scripts/cibuild.cmd'
inputs:
filename: scripts/cibuild.cmd
arguments: '-configuration Release -architecture x86'
- template: azure-windows.yml
parameters:
name: windows_release_x86
pool: Hosted
configuration: Release
architecture: x86

- job: windows_debug_x64
pool:
name: Hosted
demands: Cmd
steps:
- task: BatchScript@1
displayName: 'Run scripts/cibuild.cmd'
inputs:
filename: scripts/cibuild.cmd
arguments: '-configuration Debug -architecture x64'
- template: azure-windows.yml
parameters:
name: windows_debug_x64
pool: Hosted
configuration: Debug
architecture: x64

- job: windows_release_x64
pool:
name: Hosted
demands: Cmd
steps:
- task: BatchScript@1
displayName: 'Run scripts/cibuild.cmd'
inputs:
filename: scripts/cibuild.cmd
arguments: '-configuration Release -architecture x64'
- template: azure-windows.yml
parameters:
name: windows_release_x64
pool: Hosted
configuration: Release
architecture: x64

- job: ubuntu_1604_debug_x64
pool:
name: Hosted Ubuntu 1604
variables:
RuntimeIdentifier: ubuntu.16.04-x64
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
inputs:
targetType: filePath
filePath: ./scripts/cibuild.sh
arguments: '--configuration Debug --architecture x64'
- template: azure-unix.yml
parameters:
name: ubuntu_debug_x64
pool: Hosted Ubuntu 1604
configuration: Debug
architecture: x64
rid: ubuntu.16.04-x64

- job: ubuntu_1604_release_x64
pool:
name: Hosted Ubuntu 1604
variables:
RuntimeIdentifier: ubuntu.16.04-x64
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
inputs:
targetType: filePath
filePath: ./scripts/cibuild.sh
arguments: '--configuration Release --architecture x64'
- template: azure-unix.yml
parameters:
name: ubuntu_release_x64
pool: Hosted Ubuntu 1604
configuration: Release
architecture: x64
rid: ubuntu.16.04-x64

- job: macos_1014_debug_x64
pool:
name: Hosted macOS
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
inputs:
targetType: filePath
filePath: ./scripts/cibuild.sh
arguments: '--configuration Debug --architecture x64'
- template: azure-unix.yml
parameters:
name: macos_debug_x64
pool: Hosted macOS
configuration: Debug
architecture: x64

- job: macos_1014_release_x64
pool:
name: Hosted macOS
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
inputs:
targetType: filePath
filePath: ./scripts/cibuild.sh
arguments: '--configuration Release --architecture x64'
- template: azure-unix.yml
parameters:
name: macos_release_x64
pool: Hosted macOS
configuration: Release
architecture: x64
@@ -0,0 +1,29 @@
jobs:
- job: ${{parameters.name}}
pool:
name: ${{parameters.pool}}
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
inputs:
targetType: filePath
filePath: ./scripts/cibuild.sh
arguments: '--configuration ${{parameters.configuration}} --architecture ${{parameters.architecture}}'
- task: PublishTestResults@2
displayName: 'Publish Test Results'
inputs:
testResultsFormat: VSTest
testResultsFiles: artifacts/tst/${{parameters.configuration}}/*.trx
mergeTestResults: true
failTaskOnFailedTests: true
testRunTitle: '${{parameters.name}}'
buildConfiguration: ${{parameters.configuration}}
buildPlatform: ${{parameters.architecture}}
- task: PublishBuildArtifacts@1
displayName: 'Publish NuGet Packages'
inputs:
PathtoPublish: artifacts/pkg/${{parameters.configuration}}
ArtifactName: packages
publishLocation: Container
variables:
RuntimeIdentifier: ${{parameters.rid}}
@@ -0,0 +1,27 @@
jobs:
- job: ${{parameters.name}}
pool:
name: ${{parameters.pool}}
demands: Cmd
steps:
- task: BatchScript@1
displayName: 'Run scripts/cibuild.cmd'
inputs:
filename: scripts/cibuild.cmd
arguments: '-configuration ${{parameters.configuration}} -architecture ${{parameters.architecture}}'
- task: PublishTestResults@2
displayName: 'Publish Test Results'
inputs:
testResultsFormat: VSTest
testResultsFiles: artifacts/tst/${{parameters.configuration}}/*.trx
mergeTestResults: true
failTaskOnFailedTests: true
testRunTitle: '${{parameters.name}}'
buildConfiguration: ${{parameters.configuration}}
buildPlatform: ${{parameters.architecture}}
- task: PublishBuildArtifacts@1
displayName: 'Publish NuGet Packages'
inputs:
PathtoPublish: artifacts/pkg/${{parameters.configuration}}
ArtifactName: packages
publishLocation: Container
@@ -120,7 +120,7 @@ try {
$DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet"
Create-Directory -Path $DotNetInstallDirectory

& $DotNetInstallScript -Channel release/3.0.1xx -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
& $DotNetInstallScript -Channel release/3.0.1xx -Version 3.0.100-preview7-012821 -InstallDir $DotNetInstallDirectory -Architecture $architecture
& $DotNetInstallScript -Channel 2.1 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet
& $DotNetInstallScript -Channel 2.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet

@@ -204,7 +204,7 @@ if [[ ! -z "$architecture" ]]; then
DotNetInstallDirectory="$ArtifactsDir/dotnet"
CreateDirectory "$DotNetInstallDirectory"

. "$DotNetInstallScript" --channel release/3.0.1xx --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
. "$DotNetInstallScript" --channel release/3.0.1xx --version 3.0.100-preview7-012821 --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
. "$DotNetInstallScript" --channel 2.1 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet
. "$DotNetInstallScript" --channel 2.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet

0 comments on commit f522f5e

Please sign in to comment.
You can’t perform that action at this time.