Merge branch 'v1'

Author: jzheaux

.github/workflows/deploy-artifacts.yml

@@ -77,48 +77,45 @@ jobs:
           if [[ "$deploy_location" = "true" ]] ; then
             if [[ "$VERSION" =~ "-SNAPSHOT" ]] ; then
               # always default -SNAPSHOT to artifactory
-              deploy_location=artifactory
+              deploy_location=libs-snapshot-local
             elif [[ "$DEFAULT_PUBLISH_MILESTONE_CENTRAL" = "true" ]] ; then
               # if configured, non -SNAPSHOT go to central
               deploy_location=central
             elif [[ "$VERSION" =~ "-" ]] ; then
               # -M\d+, and -RC\d+ all go to artifactory by default to remain passive
               # Newer generations will only deploy -SNAPSHOT to artifactory, but they must specify default-publish-milestone-central=true
-              deploy_location=artifactory
+              deploy_location=libs-milestone-local
             else
               deploy_location=central
             fi
           fi
           echo "deploy_location=$deploy_location" >> $GITHUB_OUTPUT
-      - name: Deploy to Artifactory
-        if: ${{ steps.deploy-location.outputs.deploy_location == 'artifactory' }}
-        env:
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
-          ARTIFACTORY_BUILD_NAME: ${{ github.event.repository.name }}-${{ steps.branch-name.outputs.branch }}
-          ARTIFACTORY_BUILD_NUMBER: ${{ github.run_id }}
-          ARTIFACTORY_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          ARTIFACTORY_USER_AGENT_NAME: GitHub Actions
-          ARTIFACTORY_USER_AGENT_VERSION: Unknown
-          ARTIFACTORY_VCS_REVISION: ${{ github.sha }}
-        run: ./gradlew artifactoryPublish -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
       - name: Stage Local Artifacts for Publishing to Central
-        if: ${{ steps.deploy-location.outputs.deploy_location == 'central' }}
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
         run: |
           ./gradlew publishAllPublicationsToLocalRepository --stacktrace
-          # rm checksums to work around https://github.com/spring-io/central-publish-action/issues/11
-          find -name "*.md5" | xargs rm -f
-          find -name "*.sha*" | xargs rm -f
+      - name: Deploy to Artifactory
+        if: ${{ steps.deploy-location.outputs.deploy_location != 'artifactory' }}
+        uses: spring-io/[email protected]
+        with:
+          uri: "https://repo.spring.io"
+          repository: ${{ steps.deploy-location.outputs.deploy_location }}
+          build-name: ${{ github.event.repository.name }}-${{ steps.branch-name.outputs.branch }}
+          build-uri: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          vcs-revision: ${{ github.sha }}
+          folder: build/publications/repos
       - name: Publish Staged Artifacts to Central
         if: ${{ steps.deploy-location.outputs.deploy_location == 'central' }}
         uses: spring-io/[email protected]
         with:
           token-name: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
           token: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
           dir: build/publications/repos
+          fail-on-existing-checksums: false
       - id: artifacts-deployed
         name: Artifacts Deployed
         run: echo "result=true" >> $GITHUB_OUTPUT

.github/workflows/perform-release.yml

@@ -81,30 +81,6 @@ jobs:
       - id: has-oss-support
         name: Check OSS Support (for current branch)
         run: echo "result=$(./gradlew -q checkBranchHasOssSupport -Pbranch=$BRANCH -PgitHubAccessToken=$TOKEN)" >> $GITHUB_OUTPUT
-      - name: Wait for Milestone Artifacts
-        if: ${{ contains(inputs.project-version, '-RC') || contains(inputs.project-version, '-M') }}
-        env:
-          VERSION: ${{ inputs.project-version }}
-        run: |
-          echo "Wait for artifacts of $REPO@$VERSION to appear on milestone repository ($MILESTONE_REPO)."
-          until curl -f -s $MILESTONE_REPO/$ARTIFACT_PATH/$VERSION/ > /dev/null
-          do
-            sleep 30
-            echo "."
-          done
-          echo "Artifacts for $REPO@$VERSION have been released to milestone repository ($MILESTONE_REPO)."
-      - name: Wait for Release Artifacts
-        if: ${{ !contains(inputs.project-version, '-RC') && !contains(inputs.project-version, '-M') }}
-        env:
-          VERSION: ${{ inputs.project-version }}
-        run: |
-          echo "Wait for artifacts of $REPO@$VERSION to appear on release repository ($RELEASE_REPO)."
-          until curl -f -s $RELEASE_REPO/$ARTIFACT_PATH/$VERSION/ > /dev/null
-          do
-            sleep 30
-            echo "."
-          done
-          echo "Artifacts for $REPO@$VERSION have been released to release repository ($RELEASE_REPO)."
       - name: Create GitHub Release
         env:
           VERSION: ${{ inputs.project-version }}