Skip to content

Commit 011fc8a

Browse files
Pass GPG Directory as Parameter to templates (Azure#23800)
* Pass GPG Directory as Parameter to templates * Update build tools ref
1 parent 6e09986 commit 011fc8a

File tree

3 files changed

+30
-31
lines changed

3 files changed

+30
-31
lines changed

eng/pipelines/templates/stages/archetype-java-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,4 @@ stages:
362362
ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
363363
RepositoryUrl: $(RepositoryUrl)
364364
Target: JavaDevFeed
365-
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
366365
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java

eng/pipelines/templates/stages/archetype-sdk-client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ resources:
33
- repository: azure-sdk-build-tools
44
type: git
55
name: internal/azure-sdk-build-tools
6-
ref: refs/tags/azure-sdk-build-tools_20210603.1
6+
ref: refs/tags/azure-sdk-build-tools_20210903.1
77

88
parameters:
99
- name: Artifacts

eng/pipelines/templates/steps/java-publishing.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
RepositoryUrl: not-specified
44
GroupID:
55
ArtifactID:
6-
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
6+
GPGExecutablePath: $(Pipeline.Workspace)/azure-sdk-build-tools/tools/gpg/bin/gpg.exe
77
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
88
StageOnly: false
99

@@ -16,13 +16,13 @@ steps:
1616
workingDirectory: $(Agent.BuildDirectory)
1717
filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
1818
arguments: >
19-
-ArtifactDirectory '${{ parameters.ArtifactDirectory }}'
20-
-GroupIDFilter '${{ parameters.GroupID }}'
21-
-ArtifactIDFilter '${{ parameters.ArtifactID }}'
22-
-RepositoryUrl 'https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-$(Build.BuildID)/maven/v1'
23-
-RepositoryUsername 'nobody'
24-
-RepositoryPassword '$(System.AccessToken)'
25-
-GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe'
19+
-ArtifactDirectory ${{ parameters.ArtifactDirectory }}
20+
-GroupIDFilter ${{ parameters.GroupID }}
21+
-ArtifactIDFilter ${{ parameters.ArtifactID }}
22+
-RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-$(Build.BuildID)/maven/v1
23+
-RepositoryUsername nobody
24+
-RepositoryPassword $(System.AccessToken)
25+
-GPGExecutablePath ${{ parameters.GPGExecutablePath }}
2626
-InformationAction Continue
2727
2828
- ${{if eq(parameters.Target, 'JavaDevFeed')}}:
@@ -33,13 +33,13 @@ steps:
3333
workingDirectory: $(Agent.BuildDirectory)
3434
filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
3535
arguments: >
36-
-ArtifactDirectory '${{ parameters.ArtifactDirectory }}'
37-
-GroupIDFilter '${{ parameters.GroupID }}'
38-
-ArtifactIDFilter '${{ parameters.ArtifactID }}'
39-
-RepositoryUrl '${{ parameters.RepositoryUrl }}'
40-
-RepositoryUsername 'nobody'
41-
-RepositoryPassword '$(System.AccessToken)'
42-
-GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe'
36+
-ArtifactDirectory ${{ parameters.ArtifactDirectory }}
37+
-GroupIDFilter ${{ parameters.GroupID }}
38+
-ArtifactIDFilter ${{ parameters.ArtifactID }}
39+
-RepositoryUrl ${{ parameters.RepositoryUrl }}
40+
-RepositoryUsername nobody
41+
-RepositoryPassword $(System.AccessToken)
42+
-GPGExecutablePath ${{ parameters.GPGExecutablePath }}
4343
-InformationAction Continue
4444
4545
- ${{if eq(parameters.Target, 'AndroidDevFeed')}}:
@@ -50,13 +50,13 @@ steps:
5050
workingDirectory: $(Agent.BuildDirectory)
5151
filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
5252
arguments: >
53-
-ArtifactDirectory '${{ parameters.ArtifactDirectory }}'
54-
-GroupIDFilter '${{ parameters.GroupID }}'
55-
-ArtifactIDFilter '${{ parameters.ArtifactID }}'
56-
-RepositoryUrl 'https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-android/maven/v1'
57-
-RepositoryUsername 'nobody'
58-
-RepositoryPassword '$(System.AccessToken)'
59-
-GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe'
53+
-ArtifactDirectory ${{ parameters.ArtifactDirectory }}
54+
-GroupIDFilter ${{ parameters.GroupID }}
55+
-ArtifactIDFilter ${{ parameters.ArtifactID }}
56+
-RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-android/maven/v1
57+
-RepositoryUsername nobody
58+
-RepositoryPassword $(System.AccessToken)
59+
-GPGExecutablePath ${{ parameters.GPGExecutablePath }}
6060
-InformationAction Continue
6161
6262
- ${{if eq(parameters.Target, 'MavenCentral')}}:
@@ -67,12 +67,12 @@ steps:
6767
workingDirectory: $(Agent.BuildDirectory)
6868
filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
6969
arguments: >
70-
-ArtifactDirectory '${{ parameters.Artifact'Directory }}'
71-
-GroupIDFilter '${{ parameters.GroupID }}'
72-
-ArtifactIDFilter '${{ parameters.ArtifactID }}'
73-
-RepositoryUrl 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
74-
-RepositoryUsername 'azuresdk'
75-
-RepositoryPassword '$(azuresdk-sonatype-password)'
76-
-GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe'
70+
-ArtifactDirectory ${{ parameters.ArtifactDirectory }}
71+
-GroupIDFilter "${{ parameters.GroupID }}"
72+
-ArtifactIDFilter "${{ parameters.ArtifactID }}"
73+
-RepositoryUrl https://oss.sonatype.org/service/local/staging/deploy/maven2/
74+
-RepositoryUsername azuresdk
75+
-RepositoryPassword $(azuresdk-sonatype-password)
76+
-GPGExecutablePath ${{ parameters.GPGExecutablePath }}
7777
-StageOnly:$${{parameters.StageOnly}}
7878
-InformationAction Continue

0 commit comments

Comments
 (0)