From 9a589ea2436b4db36632a4890e4dd92cf602c5f6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 18 Apr 2024 09:54:47 +0100 Subject: [PATCH] Fix passing of repository username and password into verify See gh-40407 --- .github/workflows/release.yml | 5 +++-- .github/workflows/verify.yml | 11 +++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d59b12c342..9bb80ea1f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,10 +38,11 @@ jobs: needs: build-and-stage-release uses: ./.github/workflows/verify.yml with: - repository-username: ${{ secrets.ARTIFACTORY_USERNAME }} - repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }} staging: true version: ${{ needs.build-and-stage-release.outputs.version }} + secrets: + repository-username: ${{ secrets.ARTIFACTORY_USERNAME }} + repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }} sync-to-maven-central: name: Sync to Maven Central needs: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 8ffc514259..0d4dd6bd59 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -9,6 +9,13 @@ on: required: false default: false type: boolean + secrets: + repository-username: + required: false + type: string + repository-password: + required: false + type: string jobs: verify: name: Verify @@ -46,8 +53,8 @@ jobs: RVT_VERSION: ${{ inputs.version }} RVT_RELEASE_TYPE: oss RVT_STAGING: ${{ inputs.staging }} - RVT_OSS_REPOSITORY_USERNAME: ${{ inputs.repository-username }} - RVT_OSS_REPOSITORY_PASSWORD: ${{ inputs.repository-password }} + RVT_OSS_REPOSITORY_USERNAME: ${{ secrets.repository-username }} + RVT_OSS_REPOSITORY_PASSWORD: ${{ secrets.repository-password }} run: ./gradlew spring-boot-release-verification-tests:test - name: Upload Build Reports on Failure uses: actions/upload-artifact@v4