Attempt to attach zip artifact props

spring-projects · Oct 19, 2023 · 848d56a · 848d56a
1 parent 1bf23e8
commit 848d56a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -10,24 +10,29 @@ env:
   GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+  GRADLE_ENTERPRISE_CACHE_URL: 'https://ge-cache.spring.vmware.com/cache'
 
 jobs:
   build_snapshot:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'spring-projects'
     name: CI Build ${{ github.ref_name }} SNAPSHOT
     steps:
+
       - uses: actions/checkout@v3
+
       - uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 17
           cache: gradle
+
       - uses: jfrog/setup-jfrog-cli@v3
         with:
           version: 2.50.2
         env:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+
       - name: Configure JFrog Cli
         run: |
           jf gradlec \
@@ -40,7 +45,16 @@ jobs:
             --repo-deploy snapshot
           echo JFROG_CLI_BUILD_NAME=spring-integration-aws-${{ github.ref_name }} >> $GITHUB_ENV
           echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
+
       - name: Build and Publish
         run: |
-          jf gradle build dist artifactoryPublish
-#          jf rt build-publish
+          jf gradle build dist artifactoryPublish [email protected]
+          jf build-publish
+
+      - name: Capture Test Results
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results
+          path: '*/build/reports/tests/**/*.*'
+          retention-days: 3
diff --git a/publish-maven.gradle b/publish-maven.gradle
@@ -54,11 +54,22 @@ publishing {
     }
 }
 
+artifactory {
+    publish {
+        defaults {
+           def  zipArtifactProps =
+                   ['zip.name': 'spring-integration-aws',
+                    'zip.displayname': 'Spring Integration Aws',
+                    'zip.deployed': 'false']
+            properties {
+                mavenJava zipArtifactProps, '*:*:*:*@zip'
+                mavenJava  'zip.type': 'docs', '*:*:*:docs@zip'
+                mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
+            }
+        }
+    }
+}
+
 artifactoryPublish {
     publications(publishing.publications.mavenJava)
-    properties {
-        mavenJava '*:*:*:*@zip', 'zip.name': 'spring-integration-aws', 'zip.displayname': 'Spring Integration Aws', 'zip.deployed': false
-        mavenJava '*:*:*:docs@zip', 'zip.type': 'docs'
-        mavenJava '*:*:*:dist@zip', 'zip.type': 'dist'
-    }
 }