From 8912734144dc0d68fd484b580211d7b86ebb2eb2 Mon Sep 17 00:00:00 2001 From: Anipik Date: Thu, 2 Sep 2021 14:40:50 -0700 Subject: [PATCH 1/7] testing --- eng/pipelines/common/platform-matrix.yml | 4 ++++ eng/pipelines/global-build.yml | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index bc8803b8487085..bab399eb7b212b 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -196,6 +196,10 @@ jobs: image: centos-7-source-build-20210714125450-5d87b80 registry: mcr jobParameters: + name: TestArcadeSourceBuild + container: + image: centos-7-source-build-20210714125450-5d87b80 + registry: mcr runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} buildConfig: ${{ parameters.buildConfig }} diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 289f7d0033e9c2..57560db4e590ec 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -127,11 +127,8 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: release + jobTemplate: /eng/common/templates/job/source-build.yml platforms: - SourceBuild_Linux_x64 jobParameters: - nameSuffix: SourceBuild - buildArgs: -subset clr+libs+host+packs /p:DotNetBuildFromSource=true --portableBuild false timeoutInMinutes: 90 From fe7379a55b50d603d8a343e7bb946833e03f3bac Mon Sep 17 00:00:00 2001 From: Anipik Date: Thu, 2 Sep 2021 15:19:23 -0700 Subject: [PATCH 2/7] remove contaner --- eng/pipelines/common/platform-matrix.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index bab399eb7b212b..ad71754de96081 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -197,9 +197,6 @@ jobs: registry: mcr jobParameters: name: TestArcadeSourceBuild - container: - image: centos-7-source-build-20210714125450-5d87b80 - registry: mcr runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} buildConfig: ${{ parameters.buildConfig }} From 1162b39ce6ecfd1f5ca5afb6a99fe5b14e2dd7bf Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 3 Sep 2021 10:13:20 -0700 Subject: [PATCH 3/7] use sourceBuild Steps template --- eng/pipelines/common/global-build-job.yml | 12 ++++++++---- eng/pipelines/global-build.yml | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 84f1786bd2171d..6b8315eb64c238 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -119,6 +119,9 @@ jobs: inputs: artifact: Mono_Offsets_${{monoCrossAOTTargetOS}} path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' + + - ${{ if eq(parameters.buildingOnSourceBuildImage, true) }}: + - template: /eng/common/templates/job/source-build.yml - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO @@ -140,10 +143,11 @@ jobs: displayName: Install native dependencies # Build - - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter) - displayName: Build product - ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: - continueOnError: ${{ parameters.shouldContinueOnError }} + - ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}: + - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter) + displayName: Build product + ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: + continueOnError: ${{ parameters.shouldContinueOnError }} - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: - script: | diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 57560db4e590ec..76cd3592aa966e 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -127,7 +127,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/common/templates/job/source-build.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml platforms: - SourceBuild_Linux_x64 jobParameters: From bf32b3833600a86047a3599b5ab9643583d445fd Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 3 Sep 2021 10:17:54 -0700 Subject: [PATCH 4/7] fix the path --- eng/pipelines/common/global-build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 6b8315eb64c238..9d5e5ab1d73588 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -121,7 +121,7 @@ jobs: path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - ${{ if eq(parameters.buildingOnSourceBuildImage, true) }}: - - template: /eng/common/templates/job/source-build.yml + - template: /eng/common/templates/steps/source-build.yml - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO From 905080b6a46564a536c4889c8bd940479249e486 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 3 Sep 2021 10:32:42 -0700 Subject: [PATCH 5/7] adding build config and sourcebuild --- eng/pipelines/common/platform-matrix.yml | 1 - eng/pipelines/global-build.yml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index ad71754de96081..bc8803b8487085 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -196,7 +196,6 @@ jobs: image: centos-7-source-build-20210714125450-5d87b80 registry: mcr jobParameters: - name: TestArcadeSourceBuild runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} buildConfig: ${{ parameters.buildConfig }} diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 76cd3592aa966e..a9714fdb766783 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -128,7 +128,10 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml + buildingOnSourceBuildImage: true + buildConfig: release platforms: - SourceBuild_Linux_x64 jobParameters: + nameSuffix: SourceBuild timeoutInMinutes: 90 From 2ea1d923faba27c699dcc9751e71fe4aa41bfcfc Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 3 Sep 2021 11:47:12 -0700 Subject: [PATCH 6/7] trying some other stuff --- eng/pipelines/common/global-build-job.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 9d5e5ab1d73588..0e9e2337d5a56a 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,6 +122,7 @@ jobs: - ${{ if eq(parameters.buildingOnSourceBuildImage, true) }}: - template: /eng/common/templates/steps/source-build.yml + buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO From 3a6fc0d9fe55eb5686dd4ab68a3da1937200b184 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 3 Sep 2021 11:50:54 -0700 Subject: [PATCH 7/7] trying something else --- eng/common/templates/steps/source-build.yml | 2 +- eng/pipelines/common/global-build-job.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f1411b..f24d6c231abcb3 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -68,7 +68,7 @@ steps: publishArgs='--publish' fi - ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + ${{ coalesce(parameters.platform.buildScript, 'scl enable llvm-toolset-7.0 -- ./build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 0e9e2337d5a56a..9d5e5ab1d73588 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -122,7 +122,6 @@ jobs: - ${{ if eq(parameters.buildingOnSourceBuildImage, true) }}: - template: /eng/common/templates/steps/source-build.yml - buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO