From 3a0dfd7c9d1c3e4247107c8a9cd8e177a280d00a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 9 Jan 2019 17:34:47 -0600 Subject: [PATCH] Build definition renames for FreeBSD (dotnet/core-setup#4946) * Build definition renames for FreeBSD Build_Linux_x64_FreeBSD => Build_FreeBSD_x64 linux-build.yml => bash-build.yml * Sort lists of legs in finalize-publish.yml * Sort build legs by displayName Commit migrated from https://github.com/dotnet/core-setup/commit/6b3f198bd0546c86df9345d30b079f2b8cbbffef --- eng/jobs/{linux-build.yml => bash-build.yml} | 10 +-- eng/jobs/finalize-publish.yml | 23 +++--- eng/pipelines/installer/azure-pipelines.yml | 110 +++++++++++++-------------- 3 files changed, 72 insertions(+), 71 deletions(-) rename eng/jobs/{linux-build.yml => bash-build.yml} (95%) diff --git a/eng/jobs/linux-build.yml b/eng/jobs/bash-build.yml similarity index 95% rename from eng/jobs/linux-build.yml rename to eng/jobs/bash-build.yml index 17e227f..b01b408 100644 --- a/eng/jobs/linux-build.yml +++ b/eng/jobs/bash-build.yml @@ -22,9 +22,9 @@ jobs: - job: ${{ parameters.displayName }} displayName: ${{ parameters.displayName }} pool: - ${{ if and(eq(parameters.displayName, 'Build_Linux_x64_FreeBSD'), ne(variables['System.TeamProject'], 'public')) }}: + ${{ if and(eq(parameters.displayName, 'Build_FreeBSD_x64'), ne(variables['System.TeamProject'], 'public')) }}: name: dnceng-freebsd-internal - ${{ if ne(parameters.displayName, 'Build_Linux_x64_FreeBSD') }}: + ${{ if ne(parameters.displayName, 'Build_FreeBSD_x64') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: dnceng-linux-external-temp ${{ if ne(variables['System.TeamProject'], 'public') }}: @@ -32,14 +32,14 @@ jobs: strategy: ${{ parameters.strategy }} variables: - ${{ if ne(parameters.displayName, 'Build_Linux_x64_FreeBSD')}}: + ${{ if ne(parameters.displayName, 'Build_FreeBSD_x64')}}: RunArguments: docker run --privileged --rm -v "$(Build.SourcesDirectory):/root/coresetup" -w="/root/coresetup" ${{ parameters.additionalRunArgs }} ${{ parameters.dockerImage }} - ${{ if eq(parameters.displayName, 'Build_Linux_x64_FreeBSD')}}: + ${{ if eq(parameters.displayName, 'Build_FreeBSD_x64')}}: RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar && BuildArguments: -OfficialBuildId=$(OfficialBuildId) @@ -227,7 +227,7 @@ jobs: condition: succeededOrFailed() # Force clean up machine in case any docker images are left behind - - ${{ if ne(parameters.displayName, 'Build_Linux_x64_FreeBSD')}}: + - ${{ if ne(parameters.displayName, 'Build_FreeBSD_x64')}}: - script: docker system prune -f displayName: Run Docker clean up condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/jobs/finalize-publish.yml b/eng/jobs/finalize-publish.yml index 85ec32d..4683da0 100644 --- a/eng/jobs/finalize-publish.yml +++ b/eng/jobs/finalize-publish.yml @@ -4,31 +4,32 @@ jobs: - job: Finalize_Publish displayName: Finalize_Publish # Run only if all build legs succeeded - condition: and(succeeded('Build_Linux_x64_glibc'), - succeeded('Build_Linux_Arm64'), + condition: and( + succeeded('Build_FreeBSD_x64'), succeeded('Build_Linux_Arm'), + succeeded('Build_Linux_Arm64'), succeeded('Build_Linux_x64_Alpine36'), - succeeded('Build_Linux_x64_FreeBSD'), + succeeded('Build_Linux_x64_glibc'), succeeded('Build_Linux_x64_Rhel6'), succeeded('Build_OSX'), - succeeded('Build_Windows_x64'), - succeeded('Build_Windows_x86'), succeeded('Build_Windows_Arm'), succeeded('Build_Windows_Arm64'), + succeeded('Build_Windows_x64'), + succeeded('Build_Windows_x86'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) # Run after all dependent legs are executed dependsOn: - - Build_Linux_x64_glibc - - Build_Linux_Arm64 + - Build_FreeBSD_x64 - Build_Linux_Arm + - Build_Linux_Arm64 - Build_Linux_x64_Alpine36 - - Build_Linux_x64_FreeBSD + - Build_Linux_x64_glibc - Build_Linux_x64_Rhel6 - - Build_Windows_x64 - - Build_Windows_x86 + - Build_OSX - Build_Windows_Arm - Build_Windows_Arm64 - - Build_OSX + - Build_Windows_x64 + - Build_Windows_x86 pool: # For public or PR jobs, use the hosted pool. For internal jobs use the internal pool. # Will eventually change this to two BYOC pools. diff --git a/eng/pipelines/installer/azure-pipelines.yml b/eng/pipelines/installer/azure-pipelines.yml index d582001..57055e2 100644 --- a/eng/pipelines/installer/azure-pipelines.yml +++ b/eng/pipelines/installer/azure-pipelines.yml @@ -69,18 +69,19 @@ variables: jobs: ################################################################################ - # Build Linux legs + # Build Bash legs (Linux and FreeBSD) ################################################################################ -- template: /eng/jobs/linux-build.yml - parameters: - displayName: Build_Linux_x64_glibc - dockerImage: microsoft/dotnet-buildtools-prereqs:centos-7-d485f41-20173404063424 - packageDistroListDeb: [debian.8,debian.9,ubuntu.16.04,ubuntu.18.04] - packageDistroListRpm: [centos.7,fedora.27,opensuse.42,oraclelinux.7,sles.12] - portableBuild: true - targetArchitecture: x64 +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/jobs/bash-build.yml + parameters: + displayName: Build_FreeBSD_x64 + disableCrossgen: true + osGroup: FreeBSD + portableBuild: true + skipTests: true + targetArchitecture: x64 -- template: /eng/jobs/linux-build.yml +- template: /eng/jobs/bash-build.yml parameters: crossBuild: true displayName: Build_Linux_Arm @@ -90,7 +91,7 @@ jobs: skipTests: true targetArchitecture: arm -- template: /eng/jobs/linux-build.yml +- template: /eng/jobs/bash-build.yml parameters: crossBuild: true displayName: Build_Linux_Arm64 @@ -100,7 +101,21 @@ jobs: skipTests: true targetArchitecture: arm64 -- template: /eng/jobs/linux-build.yml +# Tizen build only for PR build +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - template: /eng/jobs/bash-build.yml + parameters: + additionalMSBuildArgs: /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.5.0.0-armel + additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/armel.tizen.build + crossBuild: true + displayName: Build_Linux_ArmRel_Tizen + disableCrossgen: true + dockerImage: tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1 + portableBuild: false + skipTests: true + targetArchitecture: armel + +- template: /eng/jobs/bash-build.yml parameters: additionalMSBuildArgs: /p:OutputRid=linux-musl-x64 displayName: Build_Linux_x64_Alpine36 @@ -108,7 +123,16 @@ jobs: portableBuild: false targetArchitecture: x64 -- template: /eng/jobs/linux-build.yml +- template: /eng/jobs/bash-build.yml + parameters: + displayName: Build_Linux_x64_glibc + dockerImage: microsoft/dotnet-buildtools-prereqs:centos-7-d485f41-20173404063424 + packageDistroListDeb: [debian.8,debian.9,ubuntu.16.04,ubuntu.18.04] + packageDistroListRpm: [centos.7,fedora.27,opensuse.42,oraclelinux.7,sles.12] + portableBuild: true + targetArchitecture: x64 + +- template: /eng/jobs/bash-build.yml parameters: additionalMSBuildArgs: /p:OutputRid=rhel.6-x64 displayName: Build_Linux_x64_Rhel6 @@ -116,47 +140,21 @@ jobs: portableBuild: false targetArchitecture: x64 -# Tizen build only for PR build -- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: /eng/jobs/linux-build.yml - parameters: - additionalMSBuildArgs: /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.5.0.0-armel - additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/armel.tizen.build - crossBuild: true - displayName: Build_Linux_ArmRel_Tizen - disableCrossgen: true - dockerImage: tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1 - portableBuild: false - skipTests: true - targetArchitecture: armel - -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - template: /eng/jobs/linux-build.yml - parameters: - displayName: Build_Linux_x64_FreeBSD - disableCrossgen: true - osGroup: FreeBSD - portableBuild: true - skipTests: true - targetArchitecture: x64 + ################################################################################ + # Build Build_OSX leg + ################################################################################ +- template: /eng/jobs/osx-build.yml ################################################################################ # Build Windows legs ################################################################################ -# Windows x64 -- template: /eng/jobs/windows-build.yml - parameters: - buildFullPlatformManifest: true - displayName: Build_Windows_x64 - publishRidAgnosticPackages: true - targetArchitecture: x64 - -# Windows x86 +# Windows Arm - template: /eng/jobs/windows-build.yml parameters: - displayName: Build_Windows_x86 - targetArchitecture: x86 + displayName: Build_Windows_Arm + skipTests: true + targetArchitecture: arm # Windows Arm64 - template: /eng/jobs/windows-build.yml @@ -165,17 +163,19 @@ jobs: skipTests: true targetArchitecture: arm64 -# Windows Arm +# Windows x64 - template: /eng/jobs/windows-build.yml parameters: - displayName: Build_Windows_Arm - skipTests: true - targetArchitecture: arm + buildFullPlatformManifest: true + displayName: Build_Windows_x64 + publishRidAgnosticPackages: true + targetArchitecture: x64 - ################################################################################ - # Build Build_OSX leg - ################################################################################ -- template: /eng/jobs/osx-build.yml +# Windows x86 +- template: /eng/jobs/windows-build.yml + parameters: + displayName: Build_Windows_x86 + targetArchitecture: x86 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: ################################################################################ -- 2.7.4