Update azure-maven-publish-1espt.yml for Azure Pipelines (#767)

* Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish.yml * Update azure-maven-publish.yml * Update azure-maven-publish.yml * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines * Update azure-maven-publish-1espt.yml for Azure Pipelines
microsoft · Feb 3, 2025 · e55ff73 · e55ff73
1 parent 2546941
commit e55ff73
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/android/azure-maven-publish-1espt.yml b/android/azure-maven-publish-1espt.yml
@@ -8,6 +8,9 @@ resources:
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
+    sdl:
+      spotBugs:
+        enabled: false
     pool:
       name: Azure-Pipelines-1ESPT-ExDShared
       image: windows-2022
@@ -21,13 +24,6 @@ extends:
         variables:
         - name: BUILDSECMON_OPT_IN
           value: true
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            displayName: 'Publish library artifact to pipeline'
-            targetPath: '$(Build.ArtifactStagingDirectory)'
-            artifactName: 'aar'
-            publishLocation: 'pipeline'
         steps:
         - task: Bash@3
           displayName: "Base64 decodes and pipes the GPG key content into the secret file"
@@ -51,14 +47,21 @@ extends:
             jdkVersionOption: "$(jdkVersion)"
             sonarQubeRunAnalysis: false
             spotBugsAnalysis: false
-        - task: Gradle@2
-          displayName: Gradle publish
+        - task: Gradle@3
+          displayName: "generate artifacts and publish to feed"
           inputs:
-            gradleWrapperFile: 'android/gradlew'
+            gradleWrapperFile: "android/gradlew"
             workingDirectory: 'android'
             tasks: 'publish'
             publishJUnitResults: false
             javaHomeOption: 'JDKVersion'
             jdkVersionOption: "$(jdkVersion)"
             sonarQubeRunAnalysis: false
-            options: "-PGPGSigningKeyID=$(gpgSignKey) -PGPGSigningPassword=$(gpgSignPassword) -PSigningSecretKeyRingFile=$(gpgSecretFileParentPath)"
+            options: "-PGPGSigningKeyID=$(gpgSignKey) -PGPGSigningPassword=$(gpgSignPassword) -PSigningSecretKeyRingFile=$(gpgSecretFileParentPath)"
+        templateContext:
+          outputs:
+          - output: pipelineArtifact
+            displayName: 'Publish library artifact to pipeline'
+            targetPath: 'android/library/build/artifacts/com/microsoft/design'
+            artifactName: 'aar'
+            publishLocation: 'pipeline'
diff --git a/android/azure-maven-publish.yml b/android/azure-maven-publish.yml
@@ -28,7 +28,7 @@ jobs:
           javaHomeOption: "JDKVersion"
           jdkVersionOption: "$(jdkVersion)"
           sonarQubeRunAnalysis: false
-          spotBugsAnalysis: false      
+          spotBugsAnalysis: false
       - task: Gradle@2
         displayName: Gradle publish
         inputs: