From 8b153e03fb645f852209a81a7289c4acc1361121 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Mon, 11 Oct 2021 15:10:51 -0700 Subject: [PATCH 1/4] Ubuntu18.04 --- .vsts-dotnet-ci.yml | 14 +++++++------- build/.night-build.yml | 8 ++++---- build/.outer-loop-build.yml | 8 ++++---- build/ci/job-template.yml | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index e43d4047ab..83741d2382 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -8,7 +8,7 @@ resources: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033 - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-20210924170306-87445d2 - container: UbuntuCrossArmContainer image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm-20210512124625-2e59a5f @@ -36,7 +36,7 @@ jobs: _targetFramework: netcoreapp3.1 innerLoop: true pool: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1804 helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20210531091521-97d8652 - template: /build/ci/job-template.yml @@ -58,7 +58,7 @@ jobs: _targetFramework: netcoreapp3.1 innerLoop: true pool: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1804 helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652 - template: /build/ci/job-template.yml @@ -79,8 +79,8 @@ jobs: _targetFramework: netcoreapp3.1 innerLoop: true pool: - name: Hosted Ubuntu 1604 - helixQueue: Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af + name: Hosted Ubuntu 1804 + helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af - template: /build/ci/job-template.yml parameters: @@ -89,8 +89,8 @@ jobs: container: UbuntuContainer innerLoop: true pool: - name: Hosted Ubuntu 1604 - helixQueue: Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af + name: Hosted Ubuntu 1804 + helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af - template: /build/ci/job-template.yml parameters: diff --git a/build/.night-build.yml b/build/.night-build.yml index 4b90a32cf2..3ffd6b7b2e 100644 --- a/build/.night-build.yml +++ b/build/.night-build.yml @@ -15,7 +15,7 @@ schedules: branches: include: - main - - releases/1.5.5 + - releases/1.6.0 - features/automl - features/integrationPackage always: true @@ -26,7 +26,7 @@ resources: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033 - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-20200515184230-2c829e8 jobs: - template: /build/ci/job-template.yml @@ -47,7 +47,7 @@ jobs: _includeBenchmarkData: true nightlyBuild: true pool: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1804 - template: /build/ci/job-template.yml parameters: @@ -56,7 +56,7 @@ jobs: container: UbuntuContainer nightlyBuild: true pool: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1804 - template: /build/ci/job-template.yml parameters: diff --git a/build/.outer-loop-build.yml b/build/.outer-loop-build.yml index 984fd67945..e2ad20368f 100644 --- a/build/.outer-loop-build.yml +++ b/build/.outer-loop-build.yml @@ -15,7 +15,7 @@ schedules: branches: include: - main - - releases/1.5.5 + - releases/1.6.0 - features/automl - features/integrationPackage always: true @@ -27,7 +27,7 @@ resources: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033 - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-20210924170306-87445d2 jobs: - template: /build/ci/job-template.yml @@ -45,7 +45,7 @@ jobs: _config_short: RI _includeBenchmarkData: true pool: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1804 - template: /build/ci/job-template.yml parameters: @@ -53,7 +53,7 @@ jobs: buildScript: ./build.sh container: UbuntuContainer pool: - name: Hosted Ubuntu 1604 + name: Hosted Ubuntu 1804 - template: /build/ci/job-template.yml parameters: diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 3284542839..20f33cd731 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -37,7 +37,7 @@ jobs: spaceValue: ' ' ${{ if eq(parameters.buildScript, './build.sh') }}: spaceValue: '%20' - ${{ if and(eq(parameters.pool.name, 'Hosted Ubuntu 1604'), contains(parameters.name, 'cross')) }}: + ${{ if and(eq(parameters.pool.name, 'Hosted Ubuntu 1804'), contains(parameters.name, 'cross')) }}: ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}' ${{ if eq(parameters.testTargetFramework, '') }}: testTargetFramework: '' @@ -79,7 +79,7 @@ jobs: - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: - script: brew update && brew install mono-libgdiplus && brew install libomp && brew link libomp --force displayName: Install MacOS ARM build dependencies - - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}: + - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1804')) }}: - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH" displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) @@ -90,7 +90,7 @@ jobs: targetType: inline script: cd packages;find . -type d -path "*/runtimes/linux-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd .. displayName: Clean up non-MacOS runtime folders of NuGet Packages to save disk space - - ${{ if eq(parameters.pool.name, 'Hosted Ubuntu 1604') }}: + - ${{ if eq(parameters.pool.name, 'Hosted Ubuntu 1804') }}: - task: Bash@3 inputs: targetType: inline From bb93a2082b47f27682c3105d0e51b36c77c60412 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Tue, 12 Oct 2021 15:47:25 -0700 Subject: [PATCH 2/4] Switching to Ubuntu 18.04 queue. --- .vsts-dotnet-ci.yml | 2 +- build/.outer-loop-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index 83741d2382..e2e3a83884 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -8,7 +8,7 @@ resources: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033 - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-20210924170306-87445d2 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8 - container: UbuntuCrossArmContainer image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm-20210512124625-2e59a5f diff --git a/build/.outer-loop-build.yml b/build/.outer-loop-build.yml index e2ad20368f..0a4bee13f5 100644 --- a/build/.outer-loop-build.yml +++ b/build/.outer-loop-build.yml @@ -27,7 +27,7 @@ resources: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033 - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-20210924170306-87445d2 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8 jobs: - template: /build/ci/job-template.yml From c32d699558a159b42c137a6b23fd62dbf4041825 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Tue, 12 Oct 2021 17:33:43 -0700 Subject: [PATCH 3/4] Fixed invalid docker id --- build/.night-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/.night-build.yml b/build/.night-build.yml index 3ffd6b7b2e..3526a33063 100644 --- a/build/.night-build.yml +++ b/build/.night-build.yml @@ -26,7 +26,7 @@ resources: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-8bba86b-20190314145033 - container: UbuntuContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-20200515184230-2c829e8 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-20200515184230-2c829e8 jobs: - template: /build/ci/job-template.yml From fda7fd7296d8cdf7f081501cea6b7a39639fcd4e Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Wed, 13 Oct 2021 13:52:51 -0700 Subject: [PATCH 4/4] yml updates. --- .vsts-dotnet-ci.yml | 18 +++++++++--------- build/.night-build.yml | 14 +++++++------- build/.outer-loop-build.yml | 14 +++++++------- build/ci/job-template.yml | 12 ++++++------ 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index e2e3a83884..37863c4204 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -36,7 +36,7 @@ jobs: _targetFramework: netcoreapp3.1 innerLoop: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20210531091521-97d8652 - template: /build/ci/job-template.yml @@ -58,7 +58,7 @@ jobs: _targetFramework: netcoreapp3.1 innerLoop: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 helixQueue: Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652 - template: /build/ci/job-template.yml @@ -79,7 +79,7 @@ jobs: _targetFramework: netcoreapp3.1 innerLoop: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix-20210528183707-dde38af - template: /build/ci/job-template.yml @@ -89,7 +89,7 @@ jobs: container: UbuntuContainer innerLoop: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 helixQueue: Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-mlnet-helix-20210528184647-dde38af - template: /build/ci/job-template.yml @@ -98,7 +98,7 @@ jobs: buildScript: ./build.sh innerLoop: true pool: - name: Hosted macOS + vmImage: macOS-10.15 helixQueue: OSX.1015.Amd64.Open - template: /build/ci/job-template.yml @@ -141,7 +141,7 @@ jobs: innerLoop: true vsTestConfiguration: "/Framework:.NETCoreApp,Version=v3.0" pool: - name: Hosted VS2017 + vmImage: windows-2019 helixQueue: Windows.10.Amd64.Open - template: /build/ci/job-template.yml @@ -151,7 +151,7 @@ jobs: innerLoop: true vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1" pool: - name: Hosted VS2017 + vmImage: windows-2019 helixQueue: Windows.10.Amd64.Open - template: /build/ci/job-template.yml @@ -172,7 +172,7 @@ jobs: innerLoop: true vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0" pool: - name: Hosted VS2017 + vmImage: windows-2019 helixQueue: Windows.10.Amd64.Open - template: /build/ci/job-template.yml @@ -183,5 +183,5 @@ jobs: innerLoop: true vsTestConfiguration: "/Framework:.NETCoreApp,Version=v2.1" pool: - name: Hosted VS2017 + vmImage: windows-2019 helixQueue: Windows.10.Amd64.Open diff --git a/build/.night-build.yml b/build/.night-build.yml index 3526a33063..e16405c217 100644 --- a/build/.night-build.yml +++ b/build/.night-build.yml @@ -47,7 +47,7 @@ jobs: _includeBenchmarkData: true nightlyBuild: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 - template: /build/ci/job-template.yml parameters: @@ -56,7 +56,7 @@ jobs: container: UbuntuContainer nightlyBuild: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 - template: /build/ci/job-template.yml parameters: @@ -64,7 +64,7 @@ jobs: buildScript: ./build.sh nightlyBuild: true pool: - name: Hosted macOS + vmImage: macOS-10.15 - template: /build/ci/job-template.yml parameters: @@ -81,7 +81,7 @@ jobs: _includeBenchmarkData: true nightlyBuild: true pool: - name: Hosted VS2017 + vmImage: windows-2019 - template: /build/ci/job-template.yml parameters: @@ -89,7 +89,7 @@ jobs: buildScript: build.cmd nightlyBuild: true pool: - name: Hosted VS2017 + vmImage: windows-2019 - template: /build/ci/job-template.yml parameters: @@ -106,7 +106,7 @@ jobs: _includeBenchmarkData: false nightlyBuild: true pool: - name: Hosted VS2017 + vmImage: windows-2019 - template: /build/ci/job-template.yml parameters: @@ -115,4 +115,4 @@ jobs: buildScript: build.cmd nightlyBuild: true pool: - name: Hosted VS2017 \ No newline at end of file + vmImage: windows-2019 \ No newline at end of file diff --git a/build/.outer-loop-build.yml b/build/.outer-loop-build.yml index 0a4bee13f5..72dbb88cc6 100644 --- a/build/.outer-loop-build.yml +++ b/build/.outer-loop-build.yml @@ -45,7 +45,7 @@ jobs: _config_short: RI _includeBenchmarkData: true pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 - template: /build/ci/job-template.yml parameters: @@ -53,14 +53,14 @@ jobs: buildScript: ./build.sh container: UbuntuContainer pool: - name: Hosted Ubuntu 1804 + vmImage: ubuntu-18.04 - template: /build/ci/job-template.yml parameters: name: MacOS_x64_NetCoreApp21 buildScript: ./build.sh pool: - name: Hosted macOS + vmImage: macOS-10.15 - template: /build/ci/job-template.yml parameters: @@ -76,14 +76,14 @@ jobs: _config_short: RI _includeBenchmarkData: true pool: - name: Hosted VS2017 + vmImage: windows-2019 - template: /build/ci/job-template.yml parameters: name: Windows_x64_NetCoreApp21 buildScript: build.cmd pool: - name: Hosted VS2017 + vmImage: windows-2019 - template: /build/ci/job-template.yml parameters: @@ -99,7 +99,7 @@ jobs: _config_short: RFX _includeBenchmarkData: false pool: - name: Hosted VS2017 + vmImage: windows-2019 - template: /build/ci/job-template.yml parameters: @@ -107,4 +107,4 @@ jobs: architecture: x86 buildScript: build.cmd pool: - name: Hosted VS2017 + vmImage: windows-2019 diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 20f33cd731..1abacb5598 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -37,7 +37,7 @@ jobs: spaceValue: ' ' ${{ if eq(parameters.buildScript, './build.sh') }}: spaceValue: '%20' - ${{ if and(eq(parameters.pool.name, 'Hosted Ubuntu 1804'), contains(parameters.name, 'cross')) }}: + ${{ if and(eq(parameters.pool.vmImage, 'ubuntu-18.04'), contains(parameters.name, 'cross')) }}: ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}' ${{ if eq(parameters.testTargetFramework, '') }}: testTargetFramework: '' @@ -66,31 +66,31 @@ jobs: steps: # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076 - - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: + - ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}: - script: | rm -rf /usr/local/bin/2to3 displayName: MacOS Homebrew bug Workaround continueOnError: true # Extra MacOS step required to install OS-specific dependencies - - ${{ if and(eq(parameters.pool.name, 'Hosted macOS'), not(contains(parameters.name, 'cross'))) }}: + - ${{ if and(eq(parameters.pool.vmImage, 'macOS-10.15'), not(contains(parameters.name, 'cross'))) }}: - script: brew update && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula && brew link libomp --force displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: - script: brew update && brew install mono-libgdiplus && brew install libomp && brew link libomp --force displayName: Install MacOS ARM build dependencies - - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1804')) }}: + - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}: - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH" displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path - script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:Coverage=${{ parameters.codeCoverage }} $(testTargetFramework) displayName: Build - - ${{ if eq(parameters.pool.name, 'Hosted macOS') }}: + - ${{ if eq(parameters.pool.vmImage, 'macOS-10.15') }}: - task: Bash@3 inputs: targetType: inline script: cd packages;find . -type d -path "*/runtimes/linux-*" -exec rm -rv {} +;find . -type d -path "*/runtimes/win-*" -exec rm -rv {} +;cd .. displayName: Clean up non-MacOS runtime folders of NuGet Packages to save disk space - - ${{ if eq(parameters.pool.name, 'Hosted Ubuntu 1804') }}: + - ${{ if eq(parameters.pool.vmImage, 'ubuntu-18.04') }}: - task: Bash@3 inputs: targetType: inline