From 11b26871e90245e35e3483e767842a50ed2c1aed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 22:12:50 +0000 Subject: [PATCH 1/3] Bump org.testcontainers:testcontainers-bom from 1.20.4 to 1.20.6 Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.20.4 to 1.20.6. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.4...1.20.6) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- alchemy-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alchemy-dependencies/pom.xml b/alchemy-dependencies/pom.xml index 2c28847f..c932e61e 100644 --- a/alchemy-dependencies/pom.xml +++ b/alchemy-dependencies/pom.xml @@ -83,7 +83,7 @@ 5.15.2 - 1.20.4 + 1.20.6 From 8a13145dc263407bf4f1b37b952736b5fca82a62 Mon Sep 17 00:00:00 2001 From: Matthew Read Date: Wed, 12 Mar 2025 11:58:22 -0400 Subject: [PATCH 2/3] use maven-settings-action --- .github/workflows/release.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf0901b9..950ce0b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,18 +58,18 @@ jobs: - name: Setup Nexus authentication and GPG passphrase uses: whelk-io/maven-settings-xml-action@v22 with: - profiles: '[ - { - "id": "gpg", - "activation": { "activeByDefault": "true" }, - "properties": { "gpg.executable": "gpg", "gpg.passphrase": "${{ secrets.GPG_PASSPHRASE }}"} - }]' - servers: '[ - { - "id": "ossrh", - "username": "${{ env.NEXUS_USER }}", - "password": "${{ env.NEXUS_PASS }}" - }]' + githubServer: false + servers: | + [{ + "id": "ossrh", + "username": "${{ env.NEXUS_USER }}", + "password": "${{ env.NEXUS_PASS }}" + }, + { + "id": "gpg.passphrase", + "passphrase": "${{ secrets.GPG_PASSPHRASE }}", + "configuration": {} + }] - name: Setup Github SSH key uses: webfactory/ssh-agent@v0.9.0 From bad1884c85a59be9f20ed3a9a8b9b0f69f6389ad Mon Sep 17 00:00:00 2001 From: Matthew Read Date: Wed, 12 Mar 2025 12:15:03 -0400 Subject: [PATCH 3/3] use actions/setup-java for maven config --- .github/workflows/release.yml | 49 +++++++++++++---------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 950ce0b0..fcfb981e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,6 @@ jobs: release: runs-on: ubuntu-latest - env: - STAGING_PROFILE_ID: ${{ secrets.OSS_NEXUS_STAGING_PROFILE_ID }} - NEXUS_USER: ${{ secrets.OSS_NEXUS_USERNAME }} - NEXUS_PASS: ${{ secrets.OSS_NEXUS_PASSWORD }} - steps: - name: Fail if not on valid branch if: github.ref != 'refs/heads/master' @@ -29,48 +24,35 @@ jobs: - name: Check out repo uses: actions/checkout@v4 + - name: Setup GPG + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + run: | + echo "$GPG_KEY" | base64 -d > private.key + gpg --import --batch --yes ./private.key + rm ./private.key + gpg -k + - name: Set up JDK 21 uses: actions/setup-java@v4 with: java-version: 21 distribution: temurin check-latest: false + server-id: ossrh + server-username: NEXUS_USER + server-password: NEXUS_PASS - name: Set up Maven uses: stCarolas/setup-maven@v5 with: - maven-version: 3.9.5 + maven-version: 3.9.9 - name: Configure git run: | git config --global user.email "infrastructure+deploy@renttherunway.com" git config --global user.name "rtr-deploy" - - name: Setup GPG - env: - GPG_KEY: ${{ secrets.GPG_KEY }} - run: | - echo "$GPG_KEY" | base64 -d > private.key - gpg --import --batch --yes ./private.key - rm ./private.key - gpg -k - - - name: Setup Nexus authentication and GPG passphrase - uses: whelk-io/maven-settings-xml-action@v22 - with: - githubServer: false - servers: | - [{ - "id": "ossrh", - "username": "${{ env.NEXUS_USER }}", - "password": "${{ env.NEXUS_PASS }}" - }, - { - "id": "gpg.passphrase", - "passphrase": "${{ secrets.GPG_PASSPHRASE }}", - "configuration": {} - }] - - name: Setup Github SSH key uses: webfactory/ssh-agent@v0.9.0 with: @@ -96,6 +78,11 @@ jobs: id: perform-release continue-on-error: true if: ${{ steps.prepare-release.outcome == 'success' }} + env: + STAGING_PROFILE_ID: ${{ secrets.OSS_NEXUS_STAGING_PROFILE_ID }} + NEXUS_USER: ${{ secrets.OSS_NEXUS_USERNAME }} + NEXUS_PASS: ${{ secrets.OSS_NEXUS_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} run: mvn -B release:perform -Darguments='-DskipTests -DskipITs' - name: Rollback on release failure