Merge 95574e2 into 90988b5

Azure · Jul 9, 2024 · a2ff9fe · a2ff9fe
2 parents 90988b5 + 95574e2
commit a2ff9fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-android-release.yml b/eng/pipelines/templates/stages/archetype-android-release.yml
@@ -81,15 +81,14 @@ stages:
                 deploy:
                   steps:
                     - checkout: self
-                    - checkout: azure-sdk-build-tools
-                      path: azure-sdk-build-tools
-                    - pwsh: |
-                        $(Pipeline.Workspace)/azure-sdk-build-tools/scripts/create-tags-and-git-release.ps1 -artifactLocation $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.safeName}} -packageRepository Maven -releaseSha $(Build.SourceVersion) -repoId $(Build.Repository.Name)
-                      displayName: 'Verify Package Tags and Create Git Releases'
-                      timeoutInMinutes: 5
-                      workingDirectory: $(Pipeline.Workspace)
-                      env:
-                        GH_TOKEN: $(azuresdk-github-pat)
+                    - download: current
+                      displayName: 'Download Artifact: ${{parameters.ArtifactName}}-signed'
+                      artifact: ${{parameters.ArtifactName}}-signed
+                    - template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml
+                      parameters:
+                        ArtifactLocation: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.safeName}}
+                        PackageRepository: Maven
+                        ReleaseSha: $(Build.SourceVersion)
 
           - ${{if ne(artifact.options.skipPublishPackage, 'true')}}:
             - deployment: PublishPackage
@@ -126,7 +125,6 @@ stages:
                           ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
                           OutputDirectory: $(Pipeline.Workspace)/EsrpPackages
                           Target: EsrpRelease
-                          BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
                           # Note: In spite of the fact that the variable is named JavaRepoRoot, the
                           # root needs to be the root of the android repository
                           JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-android

diff --git a/sdk/template/azure-sdk-template/gradle.properties b/sdk/template/azure-sdk-template/gradle.properties
@@ -1 +1 @@
-version=1.0.0-beta.19
+version=1.0.0-beta.20