diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index c4f23dd..70efaee 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -40,7 +40,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Deploy release - run: ./mvnw deploy -Prelease --batch-mode -DskipTests -DretryFailedDeploymentCount=3 + run: ./mvnw deploy -Prelease --batch-mode -DskipTests -DretryFailedDeploymentCount=3 -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} env: MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }} diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml index 1e67a8c..47b192e 100644 --- a/.github/workflows/deploy-snapshot.yml +++ b/.github/workflows/deploy-snapshot.yml @@ -26,7 +26,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Deploy snapshot - run: ./mvnw deploy -Prelease-snapshot --batch-mode --update-snapshots -DskipTests -DretryFailedDeploymentCount=3 + run: ./mvnw deploy -Prelease-snapshot --batch-mode --update-snapshots -DskipTests -DretryFailedDeploymentCount=3 -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} env: MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }} diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 40db398..037f4b1 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -22,11 +22,6 @@ jobs: java-version: 17 distribution: 'temurin' cache: 'maven' - server-id: 'snapshot-repository' - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Prepare release run: | if [ -n "${{ github.event.inputs.next-version }}" ]; then @@ -34,12 +29,7 @@ jobs: fi git config user.name "devopsHazelcast" git config user.email "" - ./mvnw --batch-mode release:prepare -Prelease -Darguments="-DskipTests" $EXTRA_ARGS - ./mvnw --batch-mode release:clean - env: - MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + ./mvnw --batch-mode release:prepare release:clean -Darguments="-DskipTests" $EXTRA_ARGS - name: Push changes run: | git push