From 80fcbe4fbd71694480fe09192aaa5819d823e087 Mon Sep 17 00:00:00 2001 From: Chidozie Ononiwu Date: Fri, 27 Aug 2021 13:35:49 -0700 Subject: [PATCH 1/2] Pass GPG Directory as Parameter to templates --- .../stages/archetype-java-release.yml | 1 - .../templates/steps/java-publishing.yml | 58 +++++++++---------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 7f74d756854c..ebb06670f514 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -362,5 +362,4 @@ stages: ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed RepositoryUrl: $(RepositoryUrl) Target: JavaDevFeed - BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java diff --git a/eng/pipelines/templates/steps/java-publishing.yml b/eng/pipelines/templates/steps/java-publishing.yml index c19635355089..4b894328ba6d 100644 --- a/eng/pipelines/templates/steps/java-publishing.yml +++ b/eng/pipelines/templates/steps/java-publishing.yml @@ -3,7 +3,7 @@ parameters: RepositoryUrl: not-specified GroupID: ArtifactID: - BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools + GPGExecutablePath: $(Pipeline.Workspace)/azure-sdk-build-tools/tools/gpg/bin/gpg.exe JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java StageOnly: false @@ -16,13 +16,13 @@ steps: workingDirectory: $(Agent.BuildDirectory) filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > - -ArtifactDirectory '${{ parameters.ArtifactDirectory }}' - -GroupIDFilter '${{ parameters.GroupID }}' - -ArtifactIDFilter '${{ parameters.ArtifactID }}' - -RepositoryUrl 'https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-$(Build.BuildID)/maven/v1' - -RepositoryUsername 'nobody' - -RepositoryPassword '$(System.AccessToken)' - -GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe' + -ArtifactDirectory ${{ parameters.ArtifactDirectory }} + -GroupIDFilter ${{ parameters.GroupID }} + -ArtifactIDFilter ${{ parameters.ArtifactID }} + -RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-$(Build.BuildID)/maven/v1 + -RepositoryUsername nobody + -RepositoryPassword $(System.AccessToken) + -GPGExecutablePath ${{ parameters.GPGExecutablePath }} -InformationAction Continue - ${{if eq(parameters.Target, 'JavaDevFeed')}}: @@ -33,13 +33,13 @@ steps: workingDirectory: $(Agent.BuildDirectory) filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > - -ArtifactDirectory '${{ parameters.ArtifactDirectory }}' - -GroupIDFilter '${{ parameters.GroupID }}' - -ArtifactIDFilter '${{ parameters.ArtifactID }}' - -RepositoryUrl '${{ parameters.RepositoryUrl }}' - -RepositoryUsername 'nobody' - -RepositoryPassword '$(System.AccessToken)' - -GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe' + -ArtifactDirectory ${{ parameters.ArtifactDirectory }} + -GroupIDFilter ${{ parameters.GroupID }} + -ArtifactIDFilter ${{ parameters.ArtifactID }} + -RepositoryUrl ${{ parameters.RepositoryUrl }} + -RepositoryUsername nobody + -RepositoryPassword $(System.AccessToken) + -GPGExecutablePath ${{ parameters.GPGExecutablePath }} -InformationAction Continue - ${{if eq(parameters.Target, 'AndroidDevFeed')}}: @@ -50,13 +50,13 @@ steps: workingDirectory: $(Agent.BuildDirectory) filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > - -ArtifactDirectory '${{ parameters.ArtifactDirectory }}' - -GroupIDFilter '${{ parameters.GroupID }}' - -ArtifactIDFilter '${{ parameters.ArtifactID }}' - -RepositoryUrl 'https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-android/maven/v1' - -RepositoryUsername 'nobody' - -RepositoryPassword '$(System.AccessToken)' - -GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe' + -ArtifactDirectory ${{ parameters.ArtifactDirectory }} + -GroupIDFilter ${{ parameters.GroupID }} + -ArtifactIDFilter ${{ parameters.ArtifactID }} + -RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-android/maven/v1 + -RepositoryUsername nobody + -RepositoryPassword $(System.AccessToken) + -GPGExecutablePath ${{ parameters.GPGExecutablePath }} -InformationAction Continue - ${{if eq(parameters.Target, 'MavenCentral')}}: @@ -67,12 +67,12 @@ steps: workingDirectory: $(Agent.BuildDirectory) filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1 arguments: > - -ArtifactDirectory '${{ parameters.Artifact'Directory }}' - -GroupIDFilter '${{ parameters.GroupID }}' - -ArtifactIDFilter '${{ parameters.ArtifactID }}' - -RepositoryUrl 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' - -RepositoryUsername 'azuresdk' - -RepositoryPassword '$(azuresdk-sonatype-password)' - -GPGExecutablePath '${{ parameters.BuildToolsPath }}/tools/gpg/bin/gpg.exe' + -ArtifactDirectory ${{ parameters.ArtifactDirectory }} + -GroupIDFilter "${{ parameters.GroupID }}" + -ArtifactIDFilter "${{ parameters.ArtifactID }}" + -RepositoryUrl https://oss.sonatype.org/service/local/staging/deploy/maven2/ + -RepositoryUsername azuresdk + -RepositoryPassword $(azuresdk-sonatype-password) + -GPGExecutablePath ${{ parameters.GPGExecutablePath }} -StageOnly:$${{parameters.StageOnly}} -InformationAction Continue \ No newline at end of file From 357579c5f1f0ee3b47b81cb4b965acf9d17b44ee Mon Sep 17 00:00:00 2001 From: Chidozie Ononiwu Date: Fri, 3 Sep 2021 17:09:12 -0700 Subject: [PATCH 2/2] Update build tools ref --- eng/pipelines/templates/stages/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 10a8169d7f6f..344c3466e90b 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -3,7 +3,7 @@ resources: - repository: azure-sdk-build-tools type: git name: internal/azure-sdk-build-tools - ref: refs/tags/azure-sdk-build-tools_20210603.1 + ref: refs/tags/azure-sdk-build-tools_20210903.1 parameters: - name: Artifacts