From 02f9d1e1c3a243a6cbf85e4f29e8ee87d8cc5eb4 Mon Sep 17 00:00:00 2001 From: Joe Grandja <10884212+jgrandja@users.noreply.github.com> Date: Tue, 22 Apr 2025 15:45:04 -0400 Subject: [PATCH] Revert "Temporarily modify workflow to complete 1.4.3 release" This reverts commit a13d7cda999ce669785004443d56c30ecb779e39. --- .../continuous-integration-workflow.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 9c3c711c..43ae08c6 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -30,13 +30,13 @@ jobs: with: test-args: --refresh-dependencies --stacktrace -PforceMavenRepositories=snapshot -PspringFrameworkVersion=6.2.+ -PspringSecurityVersion=6.4.+ secrets: inherit -# deploy-artifacts: -# name: Deploy Artifacts -# needs: [build, test] -# uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1 -# with: -# should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }} -# secrets: inherit + deploy-artifacts: + name: Deploy Artifacts + needs: [build, test] + uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1 + with: + should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }} + secrets: inherit deploy-docs: name: Deploy Docs needs: [build, test] @@ -46,11 +46,11 @@ jobs: secrets: inherit perform-release: name: Perform Release - needs: [deploy-docs] + needs: [deploy-artifacts, deploy-docs] uses: spring-io/spring-security-release-tools/.github/workflows/perform-release.yml@v1 with: - should-perform-release: true - project-version: 1.4.3 + should-perform-release: ${{ needs.deploy-artifacts.outputs.artifacts-deployed }} + project-version: ${{ needs.deploy-artifacts.outputs.project-version }} milestone-repo-url: https://repo.spring.io/artifactory/milestone release-repo-url: https://repo1.maven.org/maven2 artifact-path: org/springframework/security/spring-security-oauth2-authorization-server