From 3484e0b8b95f2e7e91a6582c98a6409fb33e4063 Mon Sep 17 00:00:00 2001 From: jashook Date: Mon, 3 Dec 2018 11:20:46 -0800 Subject: [PATCH 1/8] Initial change to use jobs/jobs.yml --- eng/xplat-job.yml | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index 9677da4bd499..ffb8a326b5d7 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -11,7 +11,7 @@ parameters: variables: {} ## any extra variables to add to the defaults defined below jobs: -- template: /eng/common/templates/phases/base.yml +- template: /eng/common/templates/jobs/jobs.yml parameters: name: ${{ parameters.name }} @@ -47,23 +47,41 @@ jobs: agentOs: Windows_NT variables: - buildConfig: ${{ parameters.buildConfig }} + - name: buildConfig + value: ${{ parameters.buildConfig }} + ${{ if eq(parameters.buildConfig, 'checked') }}: - buildConfigUpper: 'Checked' + - name: buildConfigUpper + value: 'Checked' + ${{ if eq(parameters.buildConfig, 'debug') }}: - buildConfigUpper: 'Debug' + - name: buildConfigUpper + value: 'Debug' + ${{ if eq(parameters.buildConfig, 'release') }}: - buildConfigUpper: 'Release' - archType: ${{ parameters.archType }} - osGroup: ${{ parameters.osGroup }} - osGroupName: ${{ parameters.osGroupName }} + - name: buildConfigUpper + value: 'Release' + + - name: archType + value: ${{ parameters.archType }} + + - name: osGroup + value: ${{ parameters.osGroup }} + + - name: osGroupName + value: ${{ parameters.osGroupName }} # Crossbuild specific variables. ${{ if eq(parameters.archType, 'arm') }}: - rootfsDir: /crossrootfs/arm - cacRootfsDir: /crossrootfs/x86 + - name: rootfsDir + value: /crossrootfs/arm + + - name: cacRootfsDir + value: /crossrootfs/x86 + ${{ if eq(parameters.archType, 'arm64') }}: - rootfsDir: /crossrootfs/arm64 + - name: rootfsDir + value: /crossrootfs/arm64 ${{insert}}: ${{ parameters.variables }} From 0fe5d996a0c26855edb89b91828fc4364cca91b2 Mon Sep 17 00:00:00 2001 From: jashook Date: Mon, 3 Dec 2018 12:48:49 -0800 Subject: [PATCH 2/8] Fix If syntax --- eng/xplat-job.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index ffb8a326b5d7..dc96f321d73c 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -50,17 +50,17 @@ jobs: - name: buildConfig value: ${{ parameters.buildConfig }} - ${{ if eq(parameters.buildConfig, 'checked') }}: - - name: buildConfigUpper - value: 'Checked' + - ${{ if eq(parameters.buildConfig, 'checked') }}: + - name: buildConfigUpper + value: 'Checked' - ${{ if eq(parameters.buildConfig, 'debug') }}: - - name: buildConfigUpper - value: 'Debug' + - ${{ if eq(parameters.buildConfig, 'debug') }}: + - name: buildConfigUpper + value: 'Debug' - ${{ if eq(parameters.buildConfig, 'release') }}: - - name: buildConfigUpper - value: 'Release' + - ${{ if eq(parameters.buildConfig, 'release') }}: + - name: buildConfigUpper + value: 'Release' - name: archType value: ${{ parameters.archType }} @@ -72,16 +72,16 @@ jobs: value: ${{ parameters.osGroupName }} # Crossbuild specific variables. - ${{ if eq(parameters.archType, 'arm') }}: - - name: rootfsDir - value: /crossrootfs/arm + - ${{ if eq(parameters.archType, 'arm') }}: + - name: rootfsDir + value: /crossrootfs/arm - - name: cacRootfsDir - value: /crossrootfs/x86 + - name: cacRootfsDir + value: /crossrootfs/x86 - ${{ if eq(parameters.archType, 'arm64') }}: - - name: rootfsDir - value: /crossrootfs/arm64 + - ${{ if eq(parameters.archType, 'arm64') }}: + - name: rootfsDir + value: /crossrootfs/arm64 ${{insert}}: ${{ parameters.variables }} From 284549677670ce96c733061a7d71d760ddcb7ebe Mon Sep 17 00:00:00 2001 From: jashook Date: Mon, 3 Dec 2018 12:50:35 -0800 Subject: [PATCH 3/8] Hopefully fix more syntax --- eng/xplat-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index dc96f321d73c..0f08a7ee3cd2 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -83,6 +83,6 @@ jobs: - name: rootfsDir value: /crossrootfs/arm64 - ${{insert}}: ${{ parameters.variables }} + - ${{insert}}: ${{ parameters.variables }} steps: ${{ parameters.steps }} From ac9e0441a2291a97ee4d8a467c6b031a04d1ef0e Mon Sep 17 00:00:00 2001 From: jashook Date: Mon, 3 Dec 2018 13:44:46 -0800 Subject: [PATCH 4/8] Change from jobs to job --- eng/xplat-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index 0f08a7ee3cd2..f9b42e007248 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -11,7 +11,7 @@ parameters: variables: {} ## any extra variables to add to the defaults defined below jobs: -- template: /eng/common/templates/jobs/jobs.yml +- template: /eng/common/templates/job/job.yml parameters: name: ${{ parameters.name }} From fdb91e44a1ff80fc1f3b3dceb7e39ca4d0091ede Mon Sep 17 00:00:00 2001 From: jashook Date: Mon, 3 Dec 2018 13:53:27 -0800 Subject: [PATCH 5/8] change from queue to pool --- eng/xplat-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index f9b42e007248..54171e0abb6a 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -21,7 +21,7 @@ jobs: dependsOn: ${{ parameters.dependsOn }} - queue: + pool: ${{ if and(eq(parameters.osGroup, 'Linux'), eq(variables['System.TeamProject'], 'public')) }}: name: Hosted Ubuntu 1604 ${{ if and(eq(parameters.osGroup, 'Linux'), ne(variables['System.TeamProject'], 'public')) }}: From 4433b3a9373275cf48035c62d76713152712d41d Mon Sep 17 00:00:00 2001 From: jashook Date: Mon, 3 Dec 2018 13:56:50 -0800 Subject: [PATCH 6/8] change scope of container name --- eng/xplat-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index 54171e0abb6a..1f011d431481 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -36,8 +36,8 @@ jobs: name: dotnet-external-temp timeoutInMinutes: 240 - ${{ if ne(parameters.containerName, '') }}: - container: ${{ parameters.containerName }} + ${{ if ne(parameters.containerName, '') }}: + container: ${{ parameters.containerName }} ${{ if eq(parameters.osGroup, 'Linux') }}: agentOs: Ubuntu From 92b456d441c34800eb6d812ce8f0433d6cd89d18 Mon Sep 17 00:00:00 2001 From: jashook Date: Tue, 4 Dec 2018 11:25:47 -0800 Subject: [PATCH 7/8] Change build to sync and init tools inside build.sh --- eng/build-job.yml | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/eng/build-job.yml b/eng/build-job.yml index e44df9c05f92..3a5425faaa2a 100644 --- a/eng/build-job.yml +++ b/eng/build-job.yml @@ -35,37 +35,19 @@ jobs: - script: eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies - # Run init-tools (pre-arcade dependency bootstrapping) - # TODO: replace this with an arcade equivalent - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: ./init-tools.sh - displayName: Init tools - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - - script: .\init-tools.cmd - displayName: Init tools - - # Sync - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: ./Tools/dotnetcli/dotnet msbuild build.proj /p:RestoreDuringBuild=true /t:Sync - displayName: Sync - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - - script: .\Tools\dotnetcli\dotnet.exe msbuild build.proj /p:RestoreDuringBuild=true /t:Sync - displayName: Sync - - # Build - ${{ if and(and(ne(parameters.archType, 'arm'), ne(parameters.archType, 'arm64')), ne(parameters.osGroup, 'Windows_NT')) }}: - - script: ./build.sh $(buildConfig) $(archType) -skipnuget -skiprestore + - script: ./build.sh $(buildConfig) $(archType) -skiptests displayName: Build product - ${{ if and(ne(parameters.osGroup, 'Windows_NT'), eq(parameters.archType, 'arm')) }}: - - script: ROOTFS_DIR=$(rootfsDir) CAC_ROOTFS_DIR=$(cacRootfsDir) ./build.sh $(buildConfig) $(archType) -cross -skipnuget -skiprestore + - script: ROOTFS_DIR=$(rootfsDir) CAC_ROOTFS_DIR=$(cacRootfsDir) ./build.sh $(buildConfig) $(archType) -cross -skiptests displayName: Build product - ${{ if and(ne(parameters.osGroup, 'Windows_NT'), eq(parameters.archType, 'arm64')) }}: - - script: ROOTFS_DIR=$(rootfsDir) ./build.sh $(buildConfig) $(archType) -cross -skipnuget -skiprestore + - script: ROOTFS_DIR=$(rootfsDir) ./build.sh $(buildConfig) $(archType) -cross -skiptests displayName: Build product - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: IBCOptimize? EnforcePGO? pass an OfficialBuildId? SignType? file logging parameters? - - script: set __TestIntermediateDir=int&&build.cmd $(buildConfig) $(archType) -skiptests -skipbuildpackages -skiprestore + - script: set __TestIntermediateDir=int&&build.cmd $(buildConfig) $(archType) -skiptests displayName: Build product From 310f2520538f7fd3aaa3a64cb82aa6aa63c5d1cb Mon Sep 17 00:00:00 2001 From: jashook Date: Tue, 4 Dec 2018 15:37:09 -0800 Subject: [PATCH 8/8] Add workspace --- eng/xplat-job.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/xplat-job.yml b/eng/xplat-job.yml index 1f011d431481..9c92ea4cdd42 100644 --- a/eng/xplat-job.yml +++ b/eng/xplat-job.yml @@ -36,6 +36,9 @@ jobs: name: dotnet-external-temp timeoutInMinutes: 240 + workspace: + clean: all + ${{ if ne(parameters.containerName, '') }}: container: ${{ parameters.containerName }}