diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 19c1eefe8..57ab29f19 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -122,55 +122,17 @@ jobs: push: true tags: ${{ secrets.DOCKERHUB_USERNAME }}/athena-example-books:latest - push-release-tag: - name: Bump Semantic Version - if: github.ref == 'refs/heads/master' - needs: tests - uses: QubitPi/hashicorp-aws/.github/workflows/version-bump.yml@master - with: - user: QubitPi - email: jack20220723@gmail.com - release: - name: Release athena to Maven Central + name: Release if: github.ref == 'refs/heads/master' - needs: push-release-tag runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: QubitPi/hashicorp-aws/.github/actions/jdk-setup@master - - name: Configure settings.xml for Maven Central release - uses: whelk-io/maven-settings-xml-action@v20 - with: - servers: > - [ - { - "id": "paion-data", - "username": "${{ secrets.MAVEN_CENTRAL_USERNAME }}", - "password": "${{ secrets.MAVEN_CENTRAL_TOKEN }}", - "passphrase": "${{ secrets.GPG_PASSPHRASE }}" - } - ] - profiles: > - [ - { - "id": "paion-data", - "properties": { - "gpg.keyname": "paion-data" - } - "activation": { - "activeByDefault": "true" - } - } - ] - - name: Fetch GPG key - run: gpg --keyserver keyserver.ubuntu.com --recv-keys ${{ secrets.GPG_PUB_KEY }} - - name: Bump version - run: | - VERSION=$(git describe) - echo "INFO Last tag: $VERSION" - mvn versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false - mvn versions:update-property -Dproperty=version.athena -DnewVersion=$VERSION -DgenerateBackupPoms=false - name: Release - run: mvn clean deploy -P release -DskipTests + uses: QubitPi/maven-central-release-action@master + with: + user: QubitPi + email: jack20220723@gmail.com + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} + server-username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + server-password: ${{ secrets.MAVEN_CENTRAL_TOKEN }} diff --git a/pom.xml b/pom.xml index ca8a8d451..6a32ea71c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,14 +36,6 @@ - - - github - GitHub QubitPi Apache Maven Packages - https://maven.pkg.github.com/paiondata/athena - - - scm:git:ssh://git@github.com/paion-data/athena.git https://github.com/paion-data/athena.git