diff --git a/.github/workflows/maven_deploy_snapshot.yml b/.github/workflows/maven_deploy_snapshot.yml index fc61bfeb..c434d404 100644 --- a/.github/workflows/maven_deploy_snapshot.yml +++ b/.github/workflows/maven_deploy_snapshot.yml @@ -14,11 +14,6 @@ jobs: if: github.repository == 'eclipse-serializer/serializer' runs-on: ubuntu-latest steps: - - id: install-secret-key - name: Install gpg secret key - run: | - cat <(echo -e "${{ secrets.ORG_GPG_PRIVATE_KEY }}") | gpg --batch --import - gpg --list-secret-keys --keyid-format LONG - uses: actions/checkout@v3 - name: Set up Java for publishing to Maven Central Snapshot Repository uses: actions/setup-java@v3 @@ -29,13 +24,13 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-passphrase: PASSPHRASE - name: Make a snapshot run: mvn -Pdeploy --no-transfer-progress --batch-mode clean deploy env: MAVEN_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }} - PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }} #java 17 build - uses: actions/checkout@v3 @@ -48,7 +43,6 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-passphrase: PASSPHRASE - name: Build with java 17 run: | mvn -pl persistence/binary-jdk17 clean install -am -B @@ -58,4 +52,6 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }} - PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }} + diff --git a/.github/workflows/maven_deploy_snapshot_dev.yml b/.github/workflows/maven_deploy_snapshot_dev.yml index 20e35d48..7de6ec0f 100644 --- a/.github/workflows/maven_deploy_snapshot_dev.yml +++ b/.github/workflows/maven_deploy_snapshot_dev.yml @@ -14,11 +14,6 @@ jobs: if: github.repository == 'eclipse-serializer/serializer' runs-on: ubuntu-latest steps: - - id: install-secret-key - name: Install gpg secret key - run: | - cat <(echo -e "${{ secrets.ORG_GPG_PRIVATE_KEY }}") | gpg --batch --import - gpg --list-secret-keys --keyid-format LONG - uses: actions/checkout@v3 - name: Set up Java for publishing to Maven Central Snapshot Repository uses: actions/setup-java@v3 @@ -29,7 +24,6 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-passphrase: PASSPHRASE - name: Prepare suffix run: | function prepareSuffix() { @@ -57,7 +51,8 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }} - PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }} #java 17 build - uses: actions/checkout@v3 @@ -70,7 +65,6 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-passphrase: PASSPHRASE - name: Prepare suffix run: | function prepareSuffix() { @@ -102,4 +96,5 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }} - PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }} + MAVEN_GPG_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }} diff --git a/pom.xml b/pom.xml index 9fff0674..04ea73cf 100644 --- a/pom.xml +++ b/pom.xml @@ -252,6 +252,7 @@ --pinentry-mode loopback + bc