From 177c65b23ac07b28a67f5160fe9260694b7817b6 Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 13:32:31 -0700 Subject: [PATCH 01/15] Use full checkout for regen stage --- .../pipelines/templates/archetype-typespec-emitter.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index a92ad9d9935..7e8ae8e6163 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -248,11 +248,9 @@ extends: jobs: - job: Initialize steps: - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - parameters: - Paths: - - "/*" - - "!SessionRecords" + - checkout: self + fetchDepth: 0 # Full history as we are writing to the repository + clean: true - task: UseNode@1 displayName: 'Install Node.js' From 1eb6638fcb58484ed469d4c32f0264ac2ed6949b Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:07:46 -0700 Subject: [PATCH 02/15] remove fetchdepth --- eng/common/pipelines/templates/archetype-typespec-emitter.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index 7e8ae8e6163..b27a15a215d 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -249,8 +249,6 @@ extends: - job: Initialize steps: - checkout: self - fetchDepth: 0 # Full history as we are writing to the repository - clean: true - task: UseNode@1 displayName: 'Install Node.js' From 13cfbf9fd4b8277cf642d83d993219f09f42a20d Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:15:11 -0700 Subject: [PATCH 03/15] update both --- .../pipelines/templates/archetype-typespec-emitter.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index b27a15a215d..11eadc01852 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -321,15 +321,7 @@ extends: matrixArtifactsPath: $(Pipeline.Workspace)/matrix_artifacts AzureSdkRepoName: $[format('azure-sdk/{0}', split(variables['Build.Repository.Name'], '/')[1])] steps: - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - parameters: - Paths: - - "/*" - - "!SessionRecords" - Repositories: - - Name: $(AzureSdkRepoName) - Commitish: $(branchName) - WorkingDirectory: $(System.DefaultWorkingDirectory) + - checkout: self - task: UseNode@1 displayName: 'Install Node.js' From 1b7c95d495928e633e4f8da8a815551757b4f62b Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:41:49 -0700 Subject: [PATCH 04/15] checkout branch --- eng/common/pipelines/templates/archetype-typespec-emitter.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index 11eadc01852..38e67dfa7a7 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -322,6 +322,9 @@ extends: AzureSdkRepoName: $[format('azure-sdk/{0}', split(variables['Build.Repository.Name'], '/')[1])] steps: - checkout: self + - pwsh: | + git checkout $(branchName) + displayName: 'Checkout PR branch $(branchName)' - task: UseNode@1 displayName: 'Install Node.js' From 00195c1f9f10854c231197ef12b61a1f70f5ce71 Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:45:45 -0700 Subject: [PATCH 05/15] autorest --- .../stages/archetype-autorest-preview.yml | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index 6109f3e61ef..c1e3baca3bd 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -334,16 +334,7 @@ stages: jobs: - job: Initialize steps: - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - parameters: - Paths: - - "/*" - - "!SessionRecords" - Repositories: - - Name: Azure/$(sdkRepositoryName) - WorkingDirectory: $(sdkRepositoryPath) - Commitish: $(sdkRepositoryCommitSha) - SkipCheckoutNone: true + - checkout: Azure/$(sdkRepositoryName) - checkout: self path: s/autorest - checkout: azure-sdk-tools @@ -411,17 +402,9 @@ stages: steps: - checkout: self - checkout: azure-sdk-tools - - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml - parameters: - Paths: - - "/*" - - "!SessionRecords" - Repositories: - - Name: azure-sdk/$(sdkRepositoryName) - WorkingDirectory: $(sdkRepositoryPath) - Commitish: $(branchName) - SkipCheckoutNone: true - + - pwsh: | + git checkout $(branchName) + displayName: 'Checkout PR branch $(branchName)' - task: UseNode@1 displayName: 'Install Node.js' inputs: From d52fca637d02d8ad6da346a01c4a26386b4ef296 Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:47:08 -0700 Subject: [PATCH 06/15] indent --- eng/pipelines/templates/stages/archetype-autorest-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index c1e3baca3bd..17691ee0888 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -403,7 +403,7 @@ stages: - checkout: self - checkout: azure-sdk-tools - pwsh: | - git checkout $(branchName) + git checkout $(branchName) displayName: 'Checkout PR branch $(branchName)' - task: UseNode@1 displayName: 'Install Node.js' From 1a85744d727beb14f43a34009475997676b03b46 Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:51:56 -0700 Subject: [PATCH 07/15] fix --- eng/pipelines/templates/stages/archetype-autorest-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index 17691ee0888..1cb7bea994f 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -334,7 +334,7 @@ stages: jobs: - job: Initialize steps: - - checkout: Azure/$(sdkRepositoryName) + - checkout: $(sdkRepositoryName) - checkout: self path: s/autorest - checkout: azure-sdk-tools From 7121669bb833e8e4d1e82dd237f04b5fee97f02d Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:53:11 -0700 Subject: [PATCH 08/15] fix --- eng/pipelines/templates/stages/archetype-autorest-preview.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index 1cb7bea994f..dbcc3d595c3 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -326,6 +326,7 @@ stages: toolsRepositoryPath: $(Build.SourcesDirectory)/azure-sdk-tools sdkRepositoryPath: $(Build.SourcesDirectory)/azure-sdk sdkRepositoryName: $[stageDependencies.Build.Build.outputs['repositories.sdk-repository.name']] + sdkRepository: $[stageDependencies.Build.Build.outputs['repositories.sdk-repository']] pullRequestTargetBranch: $[coalesce(stageDependencies.Build.Build.outputs['repositories.sdk-repository.branch'], 'main')] sdkRepositoryCommitSha: $[stageDependencies.Build.Build.outputs['repositories.sdk-repository.version']] buildArtifactsPath: $(Pipeline.Workspace)/build_artifacts @@ -334,7 +335,7 @@ stages: jobs: - job: Initialize steps: - - checkout: $(sdkRepositoryName) + - checkout: $(sdkRepository) - checkout: self path: s/autorest - checkout: azure-sdk-tools From 508c06d6483affee61b26155f7d7027263b6e71a Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:55:04 -0700 Subject: [PATCH 09/15] compile --- eng/pipelines/templates/stages/archetype-autorest-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index dbcc3d595c3..05549e182c9 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -335,7 +335,7 @@ stages: jobs: - job: Initialize steps: - - checkout: $(sdkRepository) + - checkout: ${{ variables['sdkRepository'] }} - checkout: self path: s/autorest - checkout: azure-sdk-tools From d4220772bf048636fbab9459733cbb64e897e633 Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 14:59:38 -0700 Subject: [PATCH 10/15] use resource --- eng/pipelines/templates/stages/archetype-autorest-preview.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index 05549e182c9..e3f09ca94d5 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -326,7 +326,6 @@ stages: toolsRepositoryPath: $(Build.SourcesDirectory)/azure-sdk-tools sdkRepositoryPath: $(Build.SourcesDirectory)/azure-sdk sdkRepositoryName: $[stageDependencies.Build.Build.outputs['repositories.sdk-repository.name']] - sdkRepository: $[stageDependencies.Build.Build.outputs['repositories.sdk-repository']] pullRequestTargetBranch: $[coalesce(stageDependencies.Build.Build.outputs['repositories.sdk-repository.branch'], 'main')] sdkRepositoryCommitSha: $[stageDependencies.Build.Build.outputs['repositories.sdk-repository.version']] buildArtifactsPath: $(Pipeline.Workspace)/build_artifacts @@ -335,7 +334,7 @@ stages: jobs: - job: Initialize steps: - - checkout: ${{ variables['sdkRepository'] }} + - checkout: sdk-repository - checkout: self path: s/autorest - checkout: azure-sdk-tools From f6f36801691a7814b947cd35ba77f5228c76f01f Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 15:51:13 -0700 Subject: [PATCH 11/15] revert --- .../stages/archetype-autorest-preview.yml | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-autorest-preview.yml b/eng/pipelines/templates/stages/archetype-autorest-preview.yml index e3f09ca94d5..6109f3e61ef 100644 --- a/eng/pipelines/templates/stages/archetype-autorest-preview.yml +++ b/eng/pipelines/templates/stages/archetype-autorest-preview.yml @@ -334,7 +334,16 @@ stages: jobs: - job: Initialize steps: - - checkout: sdk-repository + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + parameters: + Paths: + - "/*" + - "!SessionRecords" + Repositories: + - Name: Azure/$(sdkRepositoryName) + WorkingDirectory: $(sdkRepositoryPath) + Commitish: $(sdkRepositoryCommitSha) + SkipCheckoutNone: true - checkout: self path: s/autorest - checkout: azure-sdk-tools @@ -402,9 +411,17 @@ stages: steps: - checkout: self - checkout: azure-sdk-tools - - pwsh: | - git checkout $(branchName) - displayName: 'Checkout PR branch $(branchName)' + - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml + parameters: + Paths: + - "/*" + - "!SessionRecords" + Repositories: + - Name: azure-sdk/$(sdkRepositoryName) + WorkingDirectory: $(sdkRepositoryPath) + Commitish: $(branchName) + SkipCheckoutNone: true + - task: UseNode@1 displayName: 'Install Node.js' inputs: From 1f9d608280a1119f64c9929a211aeb4e054a87f0 Mon Sep 17 00:00:00 2001 From: jolov Date: Mon, 28 Jul 2025 17:44:14 -0700 Subject: [PATCH 12/15] switch --- eng/common/pipelines/templates/archetype-typespec-emitter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index 38e67dfa7a7..b16d24320d0 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -323,7 +323,7 @@ extends: steps: - checkout: self - pwsh: | - git checkout $(branchName) + git switch $(branchName) displayName: 'Checkout PR branch $(branchName)' - task: UseNode@1 From 05bb2f907b37b553ee5c71533620d4bb28a5d3ec Mon Sep 17 00:00:00 2001 From: jolov Date: Tue, 29 Jul 2025 08:21:37 -0700 Subject: [PATCH 13/15] Fetch branch --- eng/common/pipelines/templates/archetype-typespec-emitter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index b16d24320d0..d1cfea681b7 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -323,6 +323,7 @@ extends: steps: - checkout: self - pwsh: | + git fetch $(branchName) git switch $(branchName) displayName: 'Checkout PR branch $(branchName)' From f9ac452242cccf50c1729038fca01d4ff2bbd0f8 Mon Sep 17 00:00:00 2001 From: jolov Date: Tue, 29 Jul 2025 08:24:47 -0700 Subject: [PATCH 14/15] origin --- eng/common/pipelines/templates/archetype-typespec-emitter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index d1cfea681b7..98bbd4fb0d0 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -323,7 +323,7 @@ extends: steps: - checkout: self - pwsh: | - git fetch $(branchName) + git fetch origin $(branchName) git switch $(branchName) displayName: 'Checkout PR branch $(branchName)' From e90a9b8faacc4af45c03da046f42eb2f6d21fc1c Mon Sep 17 00:00:00 2001 From: jolov Date: Tue, 29 Jul 2025 09:22:34 -0700 Subject: [PATCH 15/15] azure-sdk --- eng/common/pipelines/templates/archetype-typespec-emitter.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml index 98bbd4fb0d0..c359c3b1ae1 100644 --- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml +++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml @@ -323,7 +323,8 @@ extends: steps: - checkout: self - pwsh: | - git fetch origin $(branchName) + git remote add azure-sdk https://github.com/$(AzureSdkRepoName).git + git fetch azure-sdk $(branchName) git switch $(branchName) displayName: 'Checkout PR branch $(branchName)'