Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating CI to use the vmImage pool names #95

Merged
merged 2 commits into from
Nov 17, 2019
Merged

Updating CI to use the vmImage pool names #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e95e2a4
Updating CI to use the vmImage pool names
tannergooding Nov 16, 2019
f127b66
Updating CI to use the .NET Core 3.0 official release
tannergooding Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions scripts/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/azure-unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jobs:
- job: ${{parameters.name}}
pool:
name: ${{parameters.pool}}
vmImage: ${{parameters.pool}}
steps:
- task: Bash@3
displayName: 'Run scripts/cibuild.sh'
Expand Down
3 changes: 1 addition & 2 deletions scripts/azure-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down