Skip to content
Permalink
Browse files

Updating CI to use the vmImage pool names (#95)

* Updating CI to use the vmImage pool names

* Updating CI to use the .NET Core 3.0 official release
  • Loading branch information
tannergooding committed Nov 17, 2019
1 parent 6f84a56 commit 2015395c58f464c9ab59511666fd240d585f93d8
Showing with 12 additions and 13 deletions.
  1. +8 −8 scripts/azure-pipelines.yml
  2. +1 −1 scripts/azure-unix.yml
  3. +1 −2 scripts/azure-windows.yml
  4. +1 −1 scripts/build.ps1
  5. +1 −1 scripts/build.sh
@@ -8,57 +8,57 @@ jobs:
- template: azure-windows.yml
parameters:
name: windows_debug_x86
pool: Hosted
pool: windows-latest
configuration: Debug
architecture: x86

- template: azure-windows.yml
parameters:
name: windows_release_x86
pool: Hosted
pool: windows-latest
configuration: Release
architecture: x86

- template: azure-windows.yml
parameters:
name: windows_debug_x64
pool: Hosted
pool: windows-latest
configuration: Debug
architecture: x64

- template: azure-windows.yml
parameters:
name: windows_release_x64
pool: Hosted
pool: windows-latest
configuration: Release
architecture: x64

- template: azure-unix.yml
parameters:
name: ubuntu_debug_x64
pool: Hosted Ubuntu 1604
pool: ubuntu-latest
configuration: Debug
architecture: x64
rid: ubuntu.16.04-x64

- template: azure-unix.yml
parameters:
name: ubuntu_release_x64
pool: Hosted Ubuntu 1604
pool: ubuntu-latest
configuration: Release
architecture: x64
rid: ubuntu.16.04-x64

- template: azure-unix.yml
parameters:
name: macos_debug_x64
pool: Hosted macOS
pool: macOS-latest
configuration: Debug
architecture: x64

- template: azure-unix.yml
parameters:
name: macos_release_x64
pool: Hosted macOS
pool: macOS-latest
configuration: Release
architecture: x64
@@ -1,7 +1,7 @@
jobs:
- job: ${{parameters.name}}
pool:
name: ${{parameters.pool}}
vmImage: ${{parameters.pool}}
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
@@ -1,8 +1,7 @@
jobs:
- job: ${{parameters.name}}
pool:
name: ${{parameters.pool}}
demands: Cmd
vmImage: ${{parameters.pool}}
steps:
- task: BatchScript@1
displayName: 'Run scripts/cibuild.cmd'
@@ -120,7 +120,7 @@ try {
$DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet"
Create-Directory -Path $DotNetInstallDirectory

& $DotNetInstallScript -Channel release/3.0.1xx -Version 3.0.100-preview7-012821 -InstallDir $DotNetInstallDirectory -Architecture $architecture
& $DotNetInstallScript -Channel 3.0 -Version latest -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 3.0.100-preview7-012821 --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
. "$DotNetInstallScript" --channel 3.0 --version latest --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 2015395

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