From: Rakesh Singh Date: Wed, 9 Jan 2019 18:48:00 +0000 (-0800) Subject: Enable FreeBSD leg (dotnet/core-setup#4936) X-Git-Tag: submit/tizen/20210909.063632~11032^2~428 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=735bad7809a6c4da2524607cf5501f6ac0060e29;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Enable FreeBSD leg (dotnet/core-setup#4936) * Enable FreeBSD leg * Updates per review comments * Run FreeBSD leg only for internal build ( CI and official ) Commit migrated from https://github.com/dotnet/core-setup/commit/d8fe2c7a271683b22033677a8506a01906be3c6e --- diff --git a/eng/jobs/finalize-publish.yml b/eng/jobs/finalize-publish.yml index f8dccf1..85ec32d 100644 --- a/eng/jobs/finalize-publish.yml +++ b/eng/jobs/finalize-publish.yml @@ -8,6 +8,7 @@ jobs: succeeded('Build_Linux_Arm64'), succeeded('Build_Linux_Arm'), succeeded('Build_Linux_x64_Alpine36'), + succeeded('Build_Linux_x64_FreeBSD'), succeeded('Build_Linux_x64_Rhel6'), succeeded('Build_OSX'), succeeded('Build_Windows_x64'), @@ -21,7 +22,7 @@ jobs: - Build_Linux_Arm64 - Build_Linux_Arm - Build_Linux_x64_Alpine36 - # - Build_Linux_x64_FreeBSD + - Build_Linux_x64_FreeBSD - Build_Linux_x64_Rhel6 - Build_Windows_x64 - Build_Windows_x86 diff --git a/eng/jobs/linux-build.yml b/eng/jobs/linux-build.yml index 1249b11..17e227f 100644 --- a/eng/jobs/linux-build.yml +++ b/eng/jobs/linux-build.yml @@ -22,21 +22,24 @@ jobs: - job: ${{ parameters.displayName }} displayName: ${{ parameters.displayName }} pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: dnceng-linux-external-temp - ${{ if ne(variables['System.TeamProject'], 'public') }}: - name: dnceng-linux-internal-temp + ${{ if and(eq(parameters.displayName, 'Build_Linux_x64_FreeBSD'), ne(variables['System.TeamProject'], 'public')) }}: + name: dnceng-freebsd-internal + ${{ if ne(parameters.displayName, 'Build_Linux_x64_FreeBSD') }}: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: dnceng-linux-external-temp + ${{ if ne(variables['System.TeamProject'], 'public') }}: + name: dnceng-linux-internal-temp strategy: ${{ parameters.strategy }} variables: - ${{ if ne(parameters.displayName,'Build_Linux_x64_FreeBSD')}}: + ${{ if ne(parameters.displayName, 'Build_Linux_x64_FreeBSD')}}: 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_Linux_x64_FreeBSD')}}: RunArguments: export DotNetBootstrapCliTarPath=/dotnet-sdk-freebsd-x64.tar && BuildArguments: -OfficialBuildId=$(OfficialBuildId) @@ -113,7 +116,7 @@ jobs: condition: and(succeeded(), eq(variables._BuildConfig, 'Release')) # Only for glibc leg, here we produce RPMs and Debs - - ${{ if eq(parameters.displayName,'Build_Linux_x64_glibc')}}: + - ${{ if eq(parameters.displayName, 'Build_Linux_x64_glibc')}}: - task: CopyFiles@2 displayName: 'Copy built Portable linux-x64 binaries to staging directory' inputs: @@ -224,6 +227,7 @@ jobs: condition: succeededOrFailed() # Force clean up machine in case any docker images are left behind - - script: docker system prune -f - displayName: Run Docker clean up - condition: succeededOrFailed() \ No newline at end of file + - ${{ if ne(parameters.displayName, 'Build_Linux_x64_FreeBSD')}}: + - script: docker system prune -f + displayName: Run Docker clean up + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/pipelines/installer/azure-pipelines.yml b/eng/pipelines/installer/azure-pipelines.yml index 76aa791..d582001 100644 --- a/eng/pipelines/installer/azure-pipelines.yml +++ b/eng/pipelines/installer/azure-pipelines.yml @@ -130,15 +130,15 @@ jobs: skipTests: true targetArchitecture: armel -# - template: /eng/jobs/linux-build.yml -# parameters: -# additionalMSBuildArgs: /p:OutputRid=rhel.6-x64 -# displayName: Build_Linux_x64_FreeBSD -# dockerImage: microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331 -# osGroup: FreeBSD -# portableBuild: true -# skipTests: true -# targetArchitecture: x64 +- ${{ 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 Windows legs