From 69f173572803a77e7a3f57d79c0abafa5c82da65 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 17 Jan 2025 05:28:05 +0000 Subject: [PATCH 1/5] Change RPSaaSDev sync configuratio --- eng/pipelines/mirror-repos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/mirror-repos.yml b/eng/pipelines/mirror-repos.yml index ff9252a978a..fac928dabdb 100644 --- a/eng/pipelines/mirror-repos.yml +++ b/eng/pipelines/mirror-repos.yml @@ -41,7 +41,7 @@ jobs: AcceptTheirsForFinalMerge: true RPSaaSDev: Theirs: '@("**")' - Ours: '@("specification", "custom-words.txt", "cSpell.json")' + Ours: '@("specification")' Merge: '@("specification/common-types")' AcceptTheirsForFinalMerge: true ARMCoreRPDev: From ae9582a3df23715b8750a9436cbf3c71fc3e3a23 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 17 Jan 2025 18:54:34 +0000 Subject: [PATCH 2/5] Test branch sync behavior --- eng/pipelines/mirror-repos.yml | 238 ++++++++++++++++----------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/eng/pipelines/mirror-repos.yml b/eng/pipelines/mirror-repos.yml index fac928dabdb..eb486ac2788 100644 --- a/eng/pipelines/mirror-repos.yml +++ b/eng/pipelines/mirror-repos.yml @@ -12,19 +12,19 @@ jobs: displayName: Sync public repos steps: - - template: ./templates/steps/sync-repo-branch.yml - parameters: - GH_TOKEN: $(azuresdk-github-pat) - Repos: + # - template: ./templates/steps/sync-repo-branch.yml + # parameters: + # GH_TOKEN: $(azuresdk-github-pat) + # Repos: - Azure/azure-rest-api-specs: - TargetRepos: - Azure/azure-rest-api-specs-pr: - azure-sdk/azure-rest-api-specs: + # Azure/azure-rest-api-specs: + # TargetRepos: + # Azure/azure-rest-api-specs-pr: + # azure-sdk/azure-rest-api-specs: - Azure/typespec-azure: - TargetRepos: - Azure/typespec-azure-pr: + # Azure/typespec-azure: + # TargetRepos: + # Azure/typespec-azure-pr: - template: ./templates/steps/sync-repo-merge-branch.yml parameters: @@ -34,115 +34,115 @@ jobs: Azure/azure-rest-api-specs-pr: Branch: main TargetBranches: - RPSaaSMaster: - Theirs: '@("**")' - Ours: '@("specification", "custom-words.txt", "cSpell.json")' - Merge: '@("specification/common-types")' - AcceptTheirsForFinalMerge: true - RPSaaSDev: + # RPSaaSMaster: + # Theirs: '@("**")' + # Ours: '@("specification", "custom-words.txt", "cSpell.json")' + # Merge: '@("specification/common-types")' + # AcceptTheirsForFinalMerge: true + djurek/test-sync-branch: Theirs: '@("**")' Ours: '@("specification")' Merge: '@("specification/common-types")' AcceptTheirsForFinalMerge: true - ARMCoreRPDev: - Theirs: '@("**")' - Ours: '@("specification", "custom-words.txt", "cSpell.json")' - Merge: '@("specification/common-types")' - AcceptTheirsForFinalMerge: true - InternalARMContracts: - Theirs: '@("**")' - Ours: '@("specification", "custom-words.txt", "cSpell.json")' - Merge: '@("specification/common-types")' - AcceptTheirsForFinalMerge: true - - - template: ./templates/steps/sync-repo-branch.yml - parameters: - GH_TOKEN: $(azuresdk-github-pat) - Repos: - - Azure/azure-sdk-for-cpp: - TargetRepos: - Azure/azure-sdk-for-cpp-pr: - - Azure/azure-sdk-for-go: - TargetRepos: - Azure/azure-sdk-for-go-pr: - azure-sdk/azure-sdk-for-go: - azure-sdk/azure-sdk-for-go-pr: - - Azure/azure-sdk-for-java: - TargetRepos: - Azure/azure-sdk-for-java-pr: - azure-sdk/azure-sdk-for-java: - azure-sdk/azure-sdk-for-java-pr: - - Azure/azure-sdk-for-js: - TargetRepos: - Azure/azure-sdk-for-js-pr: - azure-sdk/azure-sdk-for-js: - azure-sdk/azure-sdk-for-js-pr: - - Azure/azure-sdk-for-net: - TargetRepos: - Azure/azure-sdk-for-net-pr: - azure-sdk/azure-sdk-for-net: - azure-sdk/azure-sdk-for-net-pr: - - Azure/azure-sdk-for-python: - TargetRepos: - Azure/azure-sdk-for-python-pr: - azure-sdk/azure-sdk-for-python: - azure-sdk/azure-sdk-for-python-pr: - - Azure/azure-sdk-for-ios: - TargetRepos: - Azure/azure-sdk-for-ios-pr: - azure-sdk/azure-sdk-for-ios: - - Azure/azure-sdk-for-android: - TargetRepos: - Azure/azure-sdk-for-android-pr: - azure-sdk/azure-sdk-for-android: - - Azure/azure-sdk-for-c: - TargetRepos: - Azure/azure-sdk-for-c-pr: - azure-sdk/azure-sdk-for-c: - - Azure/azure-sdk-for-rust: - TargetRepos: - Azure/azure-sdk-for-rust-pr: - azure-sdk/azure-sdk-for-rust: - azure-sdk/azure-sdk-for-rust-pr: - - Microsoft/vcpkg: - TargetRepos: - azure-sdk/vcpkg: - - Azure/azure-docs-sdk-java: - TargetRepos: - azure-sdk/azure-docs-sdk-java: - - Azure/azure-resource-manager-schemas: - TargetRepos: - azure-sdk/azure-resource-manager-schemas: - - Azure/azure-dev: - TargetRepos: - Azure/azure-dev-pr: - - MicrosoftDocs/azure-dev-docs-pr: - TargetRepos: - azure-sdk/azure-dev-docs-pr: - - - template: ./templates/steps/sync-repo-branch.yml - parameters: - GH_TOKEN: $(azuresdk-github-pat) - Repos: - - Azure/azure-sdk-for-python: - Branch: release/v3 - TargetRepos: - Azure/azure-sdk-for-python-pr: - azure-sdk/azure-sdk-for-python: - azure-sdk/azure-sdk-for-python-pr: + # ARMCoreRPDev: + # Theirs: '@("**")' + # Ours: '@("specification", "custom-words.txt", "cSpell.json")' + # Merge: '@("specification/common-types")' + # AcceptTheirsForFinalMerge: true + # InternalARMContracts: + # Theirs: '@("**")' + # Ours: '@("specification", "custom-words.txt", "cSpell.json")' + # Merge: '@("specification/common-types")' + # AcceptTheirsForFinalMerge: true + + # - template: ./templates/steps/sync-repo-branch.yml + # parameters: + # GH_TOKEN: $(azuresdk-github-pat) + # Repos: + + # Azure/azure-sdk-for-cpp: + # TargetRepos: + # Azure/azure-sdk-for-cpp-pr: + + # Azure/azure-sdk-for-go: + # TargetRepos: + # Azure/azure-sdk-for-go-pr: + # azure-sdk/azure-sdk-for-go: + # azure-sdk/azure-sdk-for-go-pr: + + # Azure/azure-sdk-for-java: + # TargetRepos: + # Azure/azure-sdk-for-java-pr: + # azure-sdk/azure-sdk-for-java: + # azure-sdk/azure-sdk-for-java-pr: + + # Azure/azure-sdk-for-js: + # TargetRepos: + # Azure/azure-sdk-for-js-pr: + # azure-sdk/azure-sdk-for-js: + # azure-sdk/azure-sdk-for-js-pr: + + # Azure/azure-sdk-for-net: + # TargetRepos: + # Azure/azure-sdk-for-net-pr: + # azure-sdk/azure-sdk-for-net: + # azure-sdk/azure-sdk-for-net-pr: + + # Azure/azure-sdk-for-python: + # TargetRepos: + # Azure/azure-sdk-for-python-pr: + # azure-sdk/azure-sdk-for-python: + # azure-sdk/azure-sdk-for-python-pr: + + # Azure/azure-sdk-for-ios: + # TargetRepos: + # Azure/azure-sdk-for-ios-pr: + # azure-sdk/azure-sdk-for-ios: + + # Azure/azure-sdk-for-android: + # TargetRepos: + # Azure/azure-sdk-for-android-pr: + # azure-sdk/azure-sdk-for-android: + + # Azure/azure-sdk-for-c: + # TargetRepos: + # Azure/azure-sdk-for-c-pr: + # azure-sdk/azure-sdk-for-c: + + # Azure/azure-sdk-for-rust: + # TargetRepos: + # Azure/azure-sdk-for-rust-pr: + # azure-sdk/azure-sdk-for-rust: + # azure-sdk/azure-sdk-for-rust-pr: + + # Microsoft/vcpkg: + # TargetRepos: + # azure-sdk/vcpkg: + + # Azure/azure-docs-sdk-java: + # TargetRepos: + # azure-sdk/azure-docs-sdk-java: + + # Azure/azure-resource-manager-schemas: + # TargetRepos: + # azure-sdk/azure-resource-manager-schemas: + + # Azure/azure-dev: + # TargetRepos: + # Azure/azure-dev-pr: + + # MicrosoftDocs/azure-dev-docs-pr: + # TargetRepos: + # azure-sdk/azure-dev-docs-pr: + + # - template: ./templates/steps/sync-repo-branch.yml + # parameters: + # GH_TOKEN: $(azuresdk-github-pat) + # Repos: + + # Azure/azure-sdk-for-python: + # Branch: release/v3 + # TargetRepos: + # Azure/azure-sdk-for-python-pr: + # azure-sdk/azure-sdk-for-python: + # azure-sdk/azure-sdk-for-python-pr: From 41ecd8cbd74543fb8445d92389cbd18764b16507 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 17 Jan 2025 19:00:42 +0000 Subject: [PATCH 3/5] Disable some behaviors for testing --- eng/pipelines/templates/steps/sync-repo-merge-branch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/steps/sync-repo-merge-branch.yml b/eng/pipelines/templates/steps/sync-repo-merge-branch.yml index 9dd121d75e4..c16be19bc59 100644 --- a/eng/pipelines/templates/steps/sync-repo-merge-branch.yml +++ b/eng/pipelines/templates/steps/sync-repo-merge-branch.yml @@ -74,11 +74,11 @@ steps: Write-Host "git push origin $mergeBranch -f" git push origin $mergeBranch -f - Write-Host "gh pr create --base ${{ target.key }} --head --reviewer weshaggard --repo ${{ repo.key }} --body $commitMessage --title $commitMessage" - gh pr create --base ${{ target.key }} --head $mergeBranch --reviewer weshaggard --repo ${{ repo.key }} --body $commitMessage --title $commitMessage + Write-Host "gh pr create --draft --base ${{ target.key }} --head --reviewer danieljurek --repo ${{ repo.key }} --body $commitMessage --title $commitMessage" + gh pr create --draft --base ${{ target.key }} --head $mergeBranch --reviewer danieljurek --repo ${{ repo.key }} --body $commitMessage --title $commitMessage - Write-Host "gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }}" - gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }} + # Write-Host "gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }}" + # gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }} displayName: Create Pull Request for merge continueOnError: true workingDirectory: ${{ parameters.WorkingDirectory }}/${{ repo.key }} From d4037be24a15ffe4684b00078da787a92c9500bc Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 17 Jan 2025 19:11:36 +0000 Subject: [PATCH 4/5] Remove testing --- eng/pipelines/mirror-repos.yml | 238 ++++++++++++++++----------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/eng/pipelines/mirror-repos.yml b/eng/pipelines/mirror-repos.yml index eb486ac2788..d01332396ec 100644 --- a/eng/pipelines/mirror-repos.yml +++ b/eng/pipelines/mirror-repos.yml @@ -12,19 +12,19 @@ jobs: displayName: Sync public repos steps: - # - template: ./templates/steps/sync-repo-branch.yml - # parameters: - # GH_TOKEN: $(azuresdk-github-pat) - # Repos: + - template: ./templates/steps/sync-repo-branch.yml + parameters: + GH_TOKEN: $(azuresdk-github-pat) + Repos: - # Azure/azure-rest-api-specs: - # TargetRepos: - # Azure/azure-rest-api-specs-pr: - # azure-sdk/azure-rest-api-specs: + Azure/azure-rest-api-specs: + TargetRepos: + Azure/azure-rest-api-specs-pr: + azure-sdk/azure-rest-api-specs: - # Azure/typespec-azure: - # TargetRepos: - # Azure/typespec-azure-pr: + Azure/typespec-azure: + TargetRepos: + Azure/typespec-azure-pr: - template: ./templates/steps/sync-repo-merge-branch.yml parameters: @@ -34,115 +34,115 @@ jobs: Azure/azure-rest-api-specs-pr: Branch: main TargetBranches: - # RPSaaSMaster: - # Theirs: '@("**")' - # Ours: '@("specification", "custom-words.txt", "cSpell.json")' - # Merge: '@("specification/common-types")' - # AcceptTheirsForFinalMerge: true - djurek/test-sync-branch: + RPSaaSMaster: + Theirs: '@("**")' + Ours: '@("specification")' + Merge: '@("specification/common-types")' + AcceptTheirsForFinalMerge: true + RPSaaSDev: + Theirs: '@("**")' + Ours: '@("specification")' + Merge: '@("specification/common-types")' + AcceptTheirsForFinalMerge: true + ARMCoreRPDev: + Theirs: '@("**")' + Ours: '@("specification")' + Merge: '@("specification/common-types")' + AcceptTheirsForFinalMerge: true + InternalARMContracts: Theirs: '@("**")' Ours: '@("specification")' Merge: '@("specification/common-types")' AcceptTheirsForFinalMerge: true - # ARMCoreRPDev: - # Theirs: '@("**")' - # Ours: '@("specification", "custom-words.txt", "cSpell.json")' - # Merge: '@("specification/common-types")' - # AcceptTheirsForFinalMerge: true - # InternalARMContracts: - # Theirs: '@("**")' - # Ours: '@("specification", "custom-words.txt", "cSpell.json")' - # Merge: '@("specification/common-types")' - # AcceptTheirsForFinalMerge: true - - # - template: ./templates/steps/sync-repo-branch.yml - # parameters: - # GH_TOKEN: $(azuresdk-github-pat) - # Repos: - - # Azure/azure-sdk-for-cpp: - # TargetRepos: - # Azure/azure-sdk-for-cpp-pr: - - # Azure/azure-sdk-for-go: - # TargetRepos: - # Azure/azure-sdk-for-go-pr: - # azure-sdk/azure-sdk-for-go: - # azure-sdk/azure-sdk-for-go-pr: - - # Azure/azure-sdk-for-java: - # TargetRepos: - # Azure/azure-sdk-for-java-pr: - # azure-sdk/azure-sdk-for-java: - # azure-sdk/azure-sdk-for-java-pr: - - # Azure/azure-sdk-for-js: - # TargetRepos: - # Azure/azure-sdk-for-js-pr: - # azure-sdk/azure-sdk-for-js: - # azure-sdk/azure-sdk-for-js-pr: - - # Azure/azure-sdk-for-net: - # TargetRepos: - # Azure/azure-sdk-for-net-pr: - # azure-sdk/azure-sdk-for-net: - # azure-sdk/azure-sdk-for-net-pr: - - # Azure/azure-sdk-for-python: - # TargetRepos: - # Azure/azure-sdk-for-python-pr: - # azure-sdk/azure-sdk-for-python: - # azure-sdk/azure-sdk-for-python-pr: - - # Azure/azure-sdk-for-ios: - # TargetRepos: - # Azure/azure-sdk-for-ios-pr: - # azure-sdk/azure-sdk-for-ios: - - # Azure/azure-sdk-for-android: - # TargetRepos: - # Azure/azure-sdk-for-android-pr: - # azure-sdk/azure-sdk-for-android: - - # Azure/azure-sdk-for-c: - # TargetRepos: - # Azure/azure-sdk-for-c-pr: - # azure-sdk/azure-sdk-for-c: - - # Azure/azure-sdk-for-rust: - # TargetRepos: - # Azure/azure-sdk-for-rust-pr: - # azure-sdk/azure-sdk-for-rust: - # azure-sdk/azure-sdk-for-rust-pr: - - # Microsoft/vcpkg: - # TargetRepos: - # azure-sdk/vcpkg: - - # Azure/azure-docs-sdk-java: - # TargetRepos: - # azure-sdk/azure-docs-sdk-java: - - # Azure/azure-resource-manager-schemas: - # TargetRepos: - # azure-sdk/azure-resource-manager-schemas: - - # Azure/azure-dev: - # TargetRepos: - # Azure/azure-dev-pr: - - # MicrosoftDocs/azure-dev-docs-pr: - # TargetRepos: - # azure-sdk/azure-dev-docs-pr: - - # - template: ./templates/steps/sync-repo-branch.yml - # parameters: - # GH_TOKEN: $(azuresdk-github-pat) - # Repos: - - # Azure/azure-sdk-for-python: - # Branch: release/v3 - # TargetRepos: - # Azure/azure-sdk-for-python-pr: - # azure-sdk/azure-sdk-for-python: - # azure-sdk/azure-sdk-for-python-pr: + + - template: ./templates/steps/sync-repo-branch.yml + parameters: + GH_TOKEN: $(azuresdk-github-pat) + Repos: + + Azure/azure-sdk-for-cpp: + TargetRepos: + Azure/azure-sdk-for-cpp-pr: + + Azure/azure-sdk-for-go: + TargetRepos: + Azure/azure-sdk-for-go-pr: + azure-sdk/azure-sdk-for-go: + azure-sdk/azure-sdk-for-go-pr: + + Azure/azure-sdk-for-java: + TargetRepos: + Azure/azure-sdk-for-java-pr: + azure-sdk/azure-sdk-for-java: + azure-sdk/azure-sdk-for-java-pr: + + Azure/azure-sdk-for-js: + TargetRepos: + Azure/azure-sdk-for-js-pr: + azure-sdk/azure-sdk-for-js: + azure-sdk/azure-sdk-for-js-pr: + + Azure/azure-sdk-for-net: + TargetRepos: + Azure/azure-sdk-for-net-pr: + azure-sdk/azure-sdk-for-net: + azure-sdk/azure-sdk-for-net-pr: + + Azure/azure-sdk-for-python: + TargetRepos: + Azure/azure-sdk-for-python-pr: + azure-sdk/azure-sdk-for-python: + azure-sdk/azure-sdk-for-python-pr: + + Azure/azure-sdk-for-ios: + TargetRepos: + Azure/azure-sdk-for-ios-pr: + azure-sdk/azure-sdk-for-ios: + + Azure/azure-sdk-for-android: + TargetRepos: + Azure/azure-sdk-for-android-pr: + azure-sdk/azure-sdk-for-android: + + Azure/azure-sdk-for-c: + TargetRepos: + Azure/azure-sdk-for-c-pr: + azure-sdk/azure-sdk-for-c: + + Azure/azure-sdk-for-rust: + TargetRepos: + Azure/azure-sdk-for-rust-pr: + azure-sdk/azure-sdk-for-rust: + azure-sdk/azure-sdk-for-rust-pr: + + Microsoft/vcpkg: + TargetRepos: + azure-sdk/vcpkg: + + Azure/azure-docs-sdk-java: + TargetRepos: + azure-sdk/azure-docs-sdk-java: + + Azure/azure-resource-manager-schemas: + TargetRepos: + azure-sdk/azure-resource-manager-schemas: + + Azure/azure-dev: + TargetRepos: + Azure/azure-dev-pr: + + MicrosoftDocs/azure-dev-docs-pr: + TargetRepos: + azure-sdk/azure-dev-docs-pr: + + - template: ./templates/steps/sync-repo-branch.yml + parameters: + GH_TOKEN: $(azuresdk-github-pat) + Repos: + + Azure/azure-sdk-for-python: + Branch: release/v3 + TargetRepos: + Azure/azure-sdk-for-python-pr: + azure-sdk/azure-sdk-for-python: + azure-sdk/azure-sdk-for-python-pr: From dd3254e4e372a8ae649d162684eeedbdc74ecb65 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 17 Jan 2025 19:12:03 +0000 Subject: [PATCH 5/5] Also revert testing --- eng/pipelines/templates/steps/sync-repo-merge-branch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/steps/sync-repo-merge-branch.yml b/eng/pipelines/templates/steps/sync-repo-merge-branch.yml index c16be19bc59..9dd121d75e4 100644 --- a/eng/pipelines/templates/steps/sync-repo-merge-branch.yml +++ b/eng/pipelines/templates/steps/sync-repo-merge-branch.yml @@ -74,11 +74,11 @@ steps: Write-Host "git push origin $mergeBranch -f" git push origin $mergeBranch -f - Write-Host "gh pr create --draft --base ${{ target.key }} --head --reviewer danieljurek --repo ${{ repo.key }} --body $commitMessage --title $commitMessage" - gh pr create --draft --base ${{ target.key }} --head $mergeBranch --reviewer danieljurek --repo ${{ repo.key }} --body $commitMessage --title $commitMessage + Write-Host "gh pr create --base ${{ target.key }} --head --reviewer weshaggard --repo ${{ repo.key }} --body $commitMessage --title $commitMessage" + gh pr create --base ${{ target.key }} --head $mergeBranch --reviewer weshaggard --repo ${{ repo.key }} --body $commitMessage --title $commitMessage - # Write-Host "gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }}" - # gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }} + Write-Host "gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }}" + gh pr merge $mergeBranch --auto --merge --repo ${{ repo.key }} displayName: Create Pull Request for merge continueOnError: true workingDirectory: ${{ parameters.WorkingDirectory }}/${{ repo.key }}