Skip to content

Commit b524d23

Browse files
authored
Sync eng/common directory with azure-sdk-tools repository for Tools PR 1000 (#15166)
1 parent 7babd4e commit b524d23

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
PROwner: azure-sdk
88
CommitMsg: not-specified
99
RepoOwner: Azure
10-
RepoName: not-specified
10+
RepoName: $(Build.Repository.Name)
1111
PushArgs:
1212
WorkingDirectory: $(System.DefaultWorkingDirectory)
1313
PRTitle: not-specified
@@ -36,6 +36,11 @@ steps:
3636
echo "No changes so skipping code push"
3737
}
3838
39+
# Remove the repo owner from the front of the repo name if it exists there
40+
$repoName = "${{ parameters.RepoName }}" -replace "^${{ parameters.RepoOwner }}/", ""
41+
echo "##vso[task.setvariable variable=RepoNameWithoutOwner]$repoName"
42+
echo "RepoName = $repName"
43+
3944
displayName: Check for changes
4045
workingDirectory: ${{ parameters.WorkingDirectory }}
4146
ignoreLASTEXITCODE: true
@@ -50,7 +55,7 @@ steps:
5055
arguments: >
5156
-PRBranchName "${{ parameters.PRBranchName }}"
5257
-CommitMsg "${{ parameters.CommitMsg }}"
53-
-GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.PROwner }}/${{ parameters.RepoName }}.git"
58+
-GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.PROwner }}/$(RepoNameWithoutOwner).git"
5459
-PushArgs "${{ parameters.PushArgs }}"
5560
5661
- task: PowerShell@2
@@ -62,7 +67,7 @@ steps:
6267
filePath: ${{ parameters.ScriptDirectory }}/Submit-PullRequest.ps1
6368
arguments: >
6469
-RepoOwner "${{ parameters.RepoOwner }}"
65-
-RepoName "${{ parameters.RepoName }}"
70+
-RepoName "$(RepoNameWithoutOwner)"
6671
-BaseBranch "${{ parameters.BaseBranchName }}"
6772
-PROwner "${{ parameters.PROwner }}"
6873
-PRBranch "${{ parameters.PRBranchName }}"
@@ -81,7 +86,7 @@ steps:
8186
filePath: ${{ parameters.ScriptDirectory }}/add-pullrequest-reviewers.ps1
8287
arguments: >
8388
-RepoOwner "${{ parameters.RepoOwner }}"
84-
-RepoName "${{ parameters.RepoName }}"
89+
-RepoName "$(RepoNameWithoutOwner)"
8590
-AuthToken "$(azuresdk-github-pat)"
8691
-GitHubUsers "$(${{ parameters.GHReviewersVariable }})"
8792
-GitHubTeams "$(${{ parameters.GHTeamReviewersVariable }})"

eng/common/pipelines/templates/steps/create-tags-and-git-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
ArtifactLocation: 'not-specified'
33
PackageRepository: 'not-specified'
44
ReleaseSha: 'not-specified'
5-
RepoId: 'not-specified'
5+
RepoId: $(Build.Repository.Name)
66
WorkingDirectory: ''
77
ScriptDirectory: eng/common/scripts
88

eng/common/pipelines/templates/steps/docs-metadata-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
ArtifactLocation: 'not-specified'
44
PackageRepository: 'not-specified'
55
ReleaseSha: 'not-specified'
6-
RepoId: 'not-specified'
6+
RepoId: $(Build.Repository.Name)
77
WorkingDirectory: ''
88
ScriptDirectory: eng/common/scripts
99
TargetDocRepoName: ''

eng/common/pipelines/templates/steps/replace-relative-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
TargetFolder: ''
33
RootFolder: ''
44
BuildSHA: ''
5-
RepoId: ''
5+
RepoId: $(Build.Repository.Name)
66

77
steps:
88
- task: PythonScript@0

0 commit comments

Comments
 (0)