From 05c974c8b29eaadea34e410d2c9cabfe05b9e5c1 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Jan 2022 11:14:11 -0800 Subject: [PATCH 01/17] Add back arm64 job --- .azure/pipelines/helix-matrix.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index bf34bfd8e01f..d9c688c646a4 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -48,3 +48,29 @@ jobs: - name: Helix_logs path: artifacts/log/ publishOnError: true + +# Helix ARM64 +- ${{ if ne(variables['System.TeamProject'], 'internal') }}: + - template: jobs/default-build.yml + parameters: + jobName: Helix_matrix_arm64 + jobDisplayName: "Tests: Helix ARM64 matrix" + agentOs: Linux + timeoutInMinutes: 480 + useHostedUbuntu: false + steps: + - script: ./eng/build.sh --ci --nobl --pack --arch arm64 + /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log + displayName: Build shared Fx + - script: ./eng/build.sh --ci --nobl --arch arm64 --noBuildRepoTasks --no-build-nodejs --no-restore --test --all + --projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true + /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log + displayName: Run build.sh helix arm64 target + env: + HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues + SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops + artifacts: + - name: Helix_arm64_logs + path: artifacts/log/ + publishOnError: true + includeForks: true From cc2a768d2fb0c81a5e74d508f0f1e1f7bfbd08f3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Jan 2022 11:15:48 -0800 Subject: [PATCH 02/17] Build on windows --- .azure/pipelines/helix-matrix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index d9c688c646a4..6e663d65e85d 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -55,9 +55,8 @@ jobs: parameters: jobName: Helix_matrix_arm64 jobDisplayName: "Tests: Helix ARM64 matrix" - agentOs: Linux + agentOs: Windows timeoutInMinutes: 480 - useHostedUbuntu: false steps: - script: ./eng/build.sh --ci --nobl --pack --arch arm64 /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log From 4325d9958fbecd664ccd3f8c3d7ea9382c5b90bd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Jan 2022 11:16:43 -0800 Subject: [PATCH 03/17] Update helix-matrix.yml --- .azure/pipelines/helix-matrix.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 6e663d65e85d..f935e360547c 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -1,5 +1,9 @@ # We only want to run full helix matrix on main -pr: none +pr: + autoCancel: true + branches: + include: + - '*' trigger: none schedules: # Cron timezone is UTC. From e2103bcc6bbc190c3b2c4ef2df144b043226217d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Jan 2022 11:19:07 -0800 Subject: [PATCH 04/17] Skip all but windows arm queue --- eng/targets/Helix.Common.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 821967b2d727..3e88bb17854b 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -37,21 +37,21 @@ - + + + + - - + + From 4d33ccb32857c153a9a033aa9068c99472fe4ef8 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Jan 2022 12:05:52 -0800 Subject: [PATCH 06/17] Update Helix.Common.props --- eng/targets/Helix.Common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index a73e4374015d..cb14b6e9cdd5 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -38,7 +38,7 @@ - + From 723242273b7848357fed77180e389cefb068447d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 10 Jan 2022 16:38:35 -0800 Subject: [PATCH 07/17] Update Helix.Common.props --- eng/targets/Helix.Common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index cb14b6e9cdd5..721010b5e7cd 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -37,8 +37,8 @@ - - + + From d6e76ec8c418998c29daafb6d14d5b0e6a29be7a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Jan 2022 10:06:40 -0800 Subject: [PATCH 08/17] Update helix-matrix.yml --- .azure/pipelines/helix-matrix.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index f935e360547c..27b1045e9f1b 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -62,13 +62,15 @@ jobs: agentOs: Windows timeoutInMinutes: 480 steps: - - script: ./eng/build.sh --ci --nobl --pack --arch arm64 + # Build the shared framework + - script: ./eng/build.cmd -ci -nobl -all -pack -arch arm64 /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log - displayName: Build shared Fx - - script: ./eng/build.sh --ci --nobl --arch arm64 --noBuildRepoTasks --no-build-nodejs --no-restore --test --all - --projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true + displayName: Build shared fx + - script: .\eng\build.cmd -ci --arch arm64 -noBuildRepoTasks -NoRestore -test -all + -projects eng\helix\helix.proj + /p:IsHelixJob=true /p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log - displayName: Run build.sh helix arm64 target + displayName: Run build.cmd helix target env: HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops From e5b4bc3312729a2b0ffa051f60c1e65408b7fad4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Jan 2022 10:17:44 -0800 Subject: [PATCH 09/17] Update Helix.Common.props --- eng/targets/Helix.Common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 721010b5e7cd..be95705ced8d 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -38,7 +38,7 @@ - + From cc86099ea562695ed13e7be75c09af7dd08811b4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Jan 2022 11:09:54 -0800 Subject: [PATCH 10/17] Update helix-matrix.yml --- .azure/pipelines/helix-matrix.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 27b1045e9f1b..66c737984150 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -62,10 +62,29 @@ jobs: agentOs: Windows timeoutInMinutes: 480 steps: - # Build the shared framework - - script: ./eng/build.cmd -ci -nobl -all -pack -arch arm64 - /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log - displayName: Build shared fx + - script: ./eng/build.cmd + -ci + -arch x64 + -pack + -all + $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) + $(Windows64LogArgs) + displayName: Build x64/arm64 + # Build the arm64 shared framework + - script: ./eng/build.cmd + -ci + -arch arm64 + -sign + -pack + -noBuildJava + -noBuildNative + /p:DotNetSignType=$(_SignType) + /p:OnlyPackPlatformSpecificPackages=true + $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) + $(WindowsArm64LogArgs) + displayName: Build ARM64 shared fx - script: .\eng\build.cmd -ci --arch arm64 -noBuildRepoTasks -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:RunTemplateTests=true From b408761149dd5e431fc480c5fe106d8f6ff4c3b7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Jan 2022 11:36:14 -0800 Subject: [PATCH 11/17] Update helix-matrix.yml --- .azure/pipelines/helix-matrix.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 66c737984150..075e6a77d181 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -67,9 +67,6 @@ jobs: -arch x64 -pack -all - $(_BuildArgs) - $(_InternalRuntimeDownloadArgs) - $(Windows64LogArgs) displayName: Build x64/arm64 # Build the arm64 shared framework - script: ./eng/build.cmd @@ -81,9 +78,6 @@ jobs: -noBuildNative /p:DotNetSignType=$(_SignType) /p:OnlyPackPlatformSpecificPackages=true - $(_BuildArgs) - $(_InternalRuntimeDownloadArgs) - $(WindowsArm64LogArgs) displayName: Build ARM64 shared fx - script: .\eng\build.cmd -ci --arch arm64 -noBuildRepoTasks -NoRestore -test -all -projects eng\helix\helix.proj From 7274deb03b3fe0d3165327a802b084376d1b68a7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 11 Jan 2022 11:36:55 -0800 Subject: [PATCH 12/17] Update helix-matrix.yml --- .azure/pipelines/helix-matrix.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 075e6a77d181..8737b2f35a69 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -72,11 +72,9 @@ jobs: - script: ./eng/build.cmd -ci -arch arm64 - -sign -pack -noBuildJava -noBuildNative - /p:DotNetSignType=$(_SignType) /p:OnlyPackPlatformSpecificPackages=true displayName: Build ARM64 shared fx - script: .\eng\build.cmd -ci --arch arm64 -noBuildRepoTasks -NoRestore -test -all From c0045b631c6321e47d42cfb46dc92b1f77350d0b Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Jan 2022 10:54:52 -0800 Subject: [PATCH 13/17] Update helix-matrix.yml --- .azure/pipelines/helix-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 8737b2f35a69..726e3664c0f4 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -77,7 +77,7 @@ jobs: -noBuildNative /p:OnlyPackPlatformSpecificPackages=true displayName: Build ARM64 shared fx - - script: .\eng\build.cmd -ci --arch arm64 -noBuildRepoTasks -NoRestore -test -all + - script: .\eng\build.cmd -ci -arch arm64 -noBuildRepoTasks -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log From ee0a47e3d62831f2cf2ece20d5c4e60c314a2d60 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Jan 2022 13:34:51 -0800 Subject: [PATCH 14/17] Update Helix.Common.props --- eng/targets/Helix.Common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index be95705ced8d..138bc1fc4ad7 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -37,8 +37,8 @@ - - + + From 6c14f1c09921b854673d301bf7b834fa96fca53a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Jan 2022 16:06:23 -0800 Subject: [PATCH 15/17] Move windows arm 64 queue to its own thing --- eng/targets/Helix.Common.props | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 138bc1fc4ad7..7ed6ddaa072f 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -33,12 +33,17 @@ + + + + + + - From 79afe870affd95ee3ca901ac5167f3a8e3b2ecd3 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 12 Jan 2022 16:09:12 -0800 Subject: [PATCH 16/17] Set flag --- .azure/pipelines/helix-matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 726e3664c0f4..9a6abda53f56 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -78,8 +78,8 @@ jobs: /p:OnlyPackPlatformSpecificPackages=true displayName: Build ARM64 shared fx - script: .\eng\build.cmd -ci -arch arm64 -noBuildRepoTasks -NoRestore -test -all - -projects eng\helix\helix.proj - /p:IsHelixJob=true /p:RunTemplateTests=true + -projects eng\helix\helix.proj /p:IsHelixWindowsArmCheck=true + /p:IsHelixJob=true /p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log displayName: Run build.cmd helix target env: From 3b8dcb9e1f9ab408cc0c2c83bf5c1d994452bf44 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 13 Jan 2022 14:35:16 -0800 Subject: [PATCH 17/17] Update Helix.Common.props --- eng/targets/Helix.Common.props | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 7ed6ddaa072f..5c185c59e802 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -43,7 +43,23 @@ - + + + + + + + + + + + + + + + + +