diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 94fd4536b..af3ad35c2 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -11,7 +11,7 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest env: - OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3_USERNAME }} + OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e25449ed4..cab5e70b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,9 +7,10 @@ jobs: release: runs-on: ubuntu-latest env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 @@ -36,8 +37,6 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Decrypt secret key - run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d - name: Release name id: release_name uses: actions/github-script@v4 diff --git a/.gitignore b/.gitignore index 2f1e27ce7..84a0e8221 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,5 @@ docs/build **/.settings **/bin -web3j.asc - # Besu-dev-quickstart logs integration-tests/src/test/resources/quorum-test-network/logs \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b32de7ad3..95f634ec6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline * Fix Snapshot release secrets [#2031](https://github.com/hyperledger/web3j/pull/2031) * Fix Sign method [#2033](https://github.com/hyperledger/web3j/pull/2033) * Revert 2031 and 2033 [#2034](https://github.com/hyperledger/web3j/pull/2034) +* Web3j release fix [2037](https://github.com/hyperledger/web3j/pull/2037) ### Features diff --git a/web3j.asc.enc b/web3j.asc.enc deleted file mode 100644 index 2bc247e7a..000000000 Binary files a/web3j.asc.enc and /dev/null differ