From bd7c99d0cbd541b8f147aeeaf8715b13ce996de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:53:29 -0700 Subject: [PATCH 1/5] [main] Change OneLocBuild mirror branch to release/8.0 temporarily --- eng/common/templates/job/onelocbuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 60ab00c4de3acd..43d00e740bbb0d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -21,13 +21,13 @@ parameters: RepoType: gitHub GitHubOrg: dotnet MirrorRepo: '' - MirrorBranch: main + MirrorBranch: release/8.0 condition: '' JobNameSuffix: '' jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} From 673e0f21b241cdf7974dcf4fc9495a0c09b04656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:01:06 -0700 Subject: [PATCH 2/5] Re-enable OneLocBuild in runtime-official.yml --- eng/pipelines/runtime-official.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 172a40e24d169f..4487ed621d77dc 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -41,13 +41,12 @@ extends: # Localization build # - # disabled due to https://github.com/dotnet/runtime/issues/90466 - #- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: - # - template: /eng/common/templates/job/onelocbuild.yml - # parameters: - # MirrorRepo: runtime - # LclSource: lclFilesfromPackage - # LclPackageId: 'LCL-JUNO-PROD-RUNTIME' + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + MirrorRepo: runtime + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-RUNTIME' # # Source Index Build From 29bfc4fde0ae1b5a2e1abedc45df2e1f89763c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:15:12 -0700 Subject: [PATCH 3/5] Do not modify common, add the parameter in the uncommented lines instead. --- eng/common/templates/job/onelocbuild.yml | 2 +- eng/pipelines/runtime-official.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 43d00e740bbb0d..af6c33e6725ee2 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -21,7 +21,7 @@ parameters: RepoType: gitHub GitHubOrg: dotnet MirrorRepo: '' - MirrorBranch: release/8.0 + MirrorBranch: main condition: '' JobNameSuffix: '' diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 4487ed621d77dc..b56e1d6fa9c309 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -45,6 +45,7 @@ extends: - template: /eng/common/templates/job/onelocbuild.yml parameters: MirrorRepo: runtime + MirrorBranch: release/8.0 LclSource: lclFilesfromPackage LclPackageId: 'LCL-JUNO-PROD-RUNTIME' From 8d74cde582eb13db882c31d4934cf7396e50589e Mon Sep 17 00:00:00 2001 From: carlossanlop <1175054+carlossanlop@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:19:14 -0700 Subject: [PATCH 4/5] Revert spacing --- eng/common/templates/job/onelocbuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index af6c33e6725ee2..60ab00c4de3acd 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -27,7 +27,7 @@ parameters: jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} From be99a26510ac3f8c9d3ce682def7c4413a779373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:04:01 -0700 Subject: [PATCH 5/5] Change condition --- eng/pipelines/runtime-official.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index b56e1d6fa9c309..46f7872817e8f3 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -41,7 +41,7 @@ extends: # Localization build # - - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/8.0') }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: MirrorRepo: runtime