Skip to content

Commit 98dc152

Browse files
azure-sdkscbedd
andauthored
Sync eng/common directory with azure-sdk-tools for PR 15454 (#46702)
* fix create-pull-request for source/target token utilization --------- Co-authored-by: Scott Beddall <scbedd@microsoft.com>
1 parent 1c4e2bf commit 98dc152

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

eng/common/pipelines/templates/steps/create-pull-request.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ steps:
3232
- template: /eng/common/pipelines/templates/steps/login-to-github.yml
3333
parameters:
3434
TokenOwners:
35+
- ${{ parameters.PROwner }}
3536
- ${{ parameters.RepoOwner }}
3637
ScriptDirectory: ${{ parameters.ScriptDirectory }}
3738

@@ -46,7 +47,8 @@ steps:
4647
WorkingDirectory: ${{ parameters.WorkingDirectory }}
4748
ScriptDirectory: ${{ parameters.ScriptDirectory }}
4849
SkipCheckingForChanges: ${{ parameters.SkipCheckingForChanges }}
49-
AuthToken: ${{ coalesce(parameters.PushAuthToken, parameters.AuthToken, '$(GH_TOKEN)') }}
50+
AuthToken: ${{ coalesce(parameters.PushAuthToken, parameters.AuthToken, format('$(GH_TOKEN_{0})', parameters.PROwner)) }}
51+
5052

5153
- task: PowerShell@2
5254
displayName: Create pull request
@@ -61,7 +63,7 @@ steps:
6163
-BaseBranch "${{ parameters.BaseBranchName }}"
6264
-PROwner "${{ parameters.PROwner }}"
6365
-PRBranch "${{ parameters.PRBranchName }}"
64-
-AuthToken "${{ coalesce(parameters.AuthToken, '$(GH_TOKEN)') }}"
66+
-AuthToken "${{ coalesce(parameters.AuthToken, format('$(GH_TOKEN_{0})', parameters.RepoOwner)) }}"
6567
-PRTitle "${{ parameters.PRTitle }}"
6668
-PRBody "${{ coalesce(parameters.PRBody, parameters.CommitMsg, parameters.PRTitle) }}"
6769
-PRLabels "${{ parameters.PRLabels }}"

eng/common/pipelines/templates/steps/git-push-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
- template: /eng/common/pipelines/templates/steps/login-to-github.yml
1616
parameters:
1717
TokenOwners:
18-
- ${{ parameters.TargetRepoOwner }}
18+
- ${{ parameters.BaseRepoOwner }}
1919
ScriptDirectory: ${{ parameters.ScriptDirectory }}
2020

2121
- task: PowerShell@2

0 commit comments

Comments
 (0)