diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml index b3843b7c4..6057f1167 100644 --- a/.github/workflows/publish-maven-central.yml +++ b/.github/workflows/publish-maven-central.yml @@ -29,7 +29,7 @@ jobs: # Runs a single command using the runners shell - name: Install gpg secret key run: | - cat <(echo -e "${{ secrets.GPG_SECRET_KEY }}") | gpg --batch --import + cat <(echo -e "${{ secrets.GPG_PASSPHRASE }}") | gpg --batch --import gpg --export-secret-keys >$HOME/.gnupg/secring.gpg gpg --list-secret-keys --keyid-format LONG ls -l $HOME/.gnupg @@ -37,7 +37,7 @@ jobs: # FIXME Check https://github.com/allure-framework/allure2/blob/430255d8cf5c236ed29bc0df0b72dcd9389c3df9/.github/workflows/release.yaml - name: Publish Release Candidate run: | - ./gradlew -PghGitSourceUsername=cbeust -PghGitSourcePassword=${{ secrets.GITHUB_TOKEN }} -PghDryRun -PghNexusUsername=${{ secrets.SONATYPE_USER }} -PghNexusPassword=${{ secrets.SONATYPE_PASSWORD }} -Psigning.secretKeyRingFile=$HOME/.gnupg/secring.gpg -Psigning.password="" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} -Prc=${{ github.event.inputs.release_candidate }} prepareVote + ./gradlew -PghGitSourceUsername=cbeust -PghGitSourcePassword=${{ secrets.GITHUB_TOKEN }} -PghDryRun -PghNexusUsername=${{ secrets.NEXUS_USERNAME }} -PghNexusPassword=${{ secrets.NEXUS_PASSWORD }} -Psigning.secretKeyRingFile=$HOME/.gnupg/secring.gpg -Psigning.password="" -Psigning.keyId=${{ secrets.GPG_PRIVATE_KEY }} -Prc=${{ github.event.inputs.release_candidate }} prepareVote - name: Display next step run: | diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 496438a5b..9940464bf 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -23,4 +23,4 @@ jobs: - name: Publish to GitHub run: | - ./gradlew -PghNexusUsername=${{ secrets.SONATYPE_USER }} -PghNexusPassword=${{ secrets.SONATYPE_PASSWORD }} -Pgh publish + ./gradlew -PghNexusUsername=${{ secrets.NEXUS_USERNAME }} -PghNexusPassword=${{ secrets.NEXUS_PASSWORD }} -Pgh publish diff --git a/.github/workflows/release-maven-central.yml b/.github/workflows/release-maven-central.yml index 22e2aa439..3429790e5 100644 --- a/.github/workflows/release-maven-central.yml +++ b/.github/workflows/release-maven-central.yml @@ -34,7 +34,7 @@ jobs: # Runs a single command using the runners shell - name: Install gpg secret key run: | - cat <(echo -e "${{ secrets.GPG_SECRET_KEY }}") | gpg --batch --import + cat <(echo -e "${{ secrets.GPG_PASSPHRASE }}") | gpg --batch --import gpg --export-secret-keys >$HOME/.gnupg/secring.gpg gpg --list-secret-keys --keyid-format LONG ls -l $HOME/.gnupg @@ -47,4 +47,4 @@ jobs: # FIXME Check https://github.com/allure-framework/allure2/blob/430255d8cf5c236ed29bc0df0b72dcd9389c3df9/.github/workflows/release.yaml - name: Publish Release Candidate run: | - ./gradlew -PghGitSourceUsername=cbeust -PghGitSourcePassword=${{ secrets.GITHUB_TOKEN }} -PghDryRun -PghNexusUsername=${{ secrets.SONATYPE_USER }} -PghNexusPassword=${{ secrets.SONATYPE_PASSWORD }} -Psigning.secretKeyRingFile=$HOME/.gnupg/secring.gpg -Psigning.password="" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} -Prc=${{ github.event.inputs.release_candidate }} publishDist + ./gradlew -PghGitSourceUsername=cbeust -PghGitSourcePassword=${{ secrets.GITHUB_TOKEN }} -PghDryRun -PghNexusUsername=${{ secrets.NEXUS_USERNAME }} -PghNexusPassword=${{ secrets.NEXUS_PASSWORD }} -Psigning.secretKeyRingFile=$HOME/.gnupg/secring.gpg -Psigning.password="" -Psigning.keyId=${{ secrets.GPG_PRIVATE_KEY }} -Prc=${{ github.event.inputs.release_candidate }} publishDist