From f3e4164afe230ad99c9a910a64d83fa326311b5e Mon Sep 17 00:00:00 2001 From: Simon Welsch Date: Wed, 14 May 2025 13:56:18 +0200 Subject: [PATCH] chore(INF-143): migrate deployment to central portal --- .github/workflows/continuous-delivery.yml | 48 +++++++++----------- .github/workflows/continuous-integration.yml | 27 ++++------- .maven.xml | 6 +-- pom.xml | 20 ++++---- 4 files changed, 44 insertions(+), 57 deletions(-) diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml index ce511c5..26a5176 100644 --- a/.github/workflows/continuous-delivery.yml +++ b/.github/workflows/continuous-delivery.yml @@ -10,19 +10,19 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Bump version and push tag + - name: Bump version and create tag id: semanticversion - uses: hennejg/github-tag-action@v4.1.jh5 + uses: mathieudutour/github-tag-action@v6.2 with: release_branches: master github_token: ${{ secrets.GITHUB_TOKEN }} - + fetch_all_tags: true + - name: Verify and print new build number run: | if echo '${{ steps.semanticversion.outputs.new_tag }}' |grep -Eq '^v[0-9]+[.][0-9]+[.][0-9]+$'; then @@ -32,21 +32,13 @@ jobs: exit -1 fi - ## Enable Caching - - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - ## Configure JDK 11 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: '11' + distribution: 'temurin' + cache: 'maven' - ## Build with maven - name: Prepare maven settings env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -66,12 +58,12 @@ jobs: ## Deploy - name: Deploy package env: - GPG_EXECUTABLE: gpg - GPG_SECRET_KEYS: ${{ secrets.LEVIGO_GPG_KEYS }} - GPG_OWNERTRUST: ${{ secrets.LEVIGO_GPG_OWNERTRUST }} - GPG_PASSPHRASE: ${{ secrets.LEVIGO_GPG_PASSPHRASE }} - SONATYPE_USERNAME: ${{ secrets.LEVIGO_SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.LEVIGO_SONATYPE_PASSWORD }} + GPG_EXECUTABLE: gpg + GPG_SECRET_KEYS: ${{ secrets.LEVIGO_GPG_KEYS }} + GPG_OWNERTRUST: ${{ secrets.LEVIGO_GPG_OWNERTRUST }} + GPG_PASSPHRASE: ${{ secrets.LEVIGO_GPG_PASSPHRASE }} + SONATYPE_USERNAME: ${{ secrets.LEVIGO_SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.LEVIGO_SONATYPE_PASSWORD }} run: | echo "$GPG_SECRET_KEYS" | base64 --decode | $GPG_EXECUTABLE --import --no-tty --batch --yes echo "$GPG_OWNERTRUST" | base64 --decode | $GPG_EXECUTABLE --import-ownertrust --no-tty --batch --yes @@ -98,13 +90,15 @@ jobs: branch: master github_token: ${{ secrets.GITHUB_TOKEN }} - ## Notify Slack - - name: Notify slack - uses: hennejg/slack-build-notifier@v1.1 + - name: Notify Developers + uses: 8398a7/action-slack@v3 with: username: GitHub icon_emoji: octocat + channel: ci_project + status: ${{ job.status }} + fields: repo,message,commit,author,action,eventName,ref text: Released new version `${{ steps.semanticversion.outputs.new_version }}` of *${{ github.repository }}* to ${{ secrets.REPOSITORY_URL }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + if: always() diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 9e8397e..fc4187e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -10,37 +10,30 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - ## Enable Caching - - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + - uses: actions/checkout@v4 - ## Configure JDK 11 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 11 + distribution: 'temurin' + cache: maven - ## Build with maven - name: Perform build run: mvn verify - ## Notify Slack - - name: Notify slack - uses: hennejg/slack-build-notifier@v1.1 + - name: Notify Developers + uses: 8398a7/action-slack@v3 with: username: GitHub icon_emoji: octocat + channel: ci_project + status: ${{ job.status }} + fields: repo,message,commit,author,action,eventName,ref + text: ${{ github.workflow }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} if: always() diff --git a/.maven.xml b/.maven.xml index f9ba5f5..984e726 100644 --- a/.maven.xml +++ b/.maven.xml @@ -5,16 +5,16 @@ - ossrh + central ${env.SONATYPE_USERNAME} ${env.SONATYPE_PASSWORD} - + - ossrh + central true diff --git a/pom.xml b/pom.xml index c22fb34..a008f59 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ BSD 3-Clause License - http://opensource.org/licenses/BSD-3-Clause + https://opensource.org/licenses/BSD-3-Clause repo @@ -39,7 +39,7 @@ Jörg Henne hennejg@gmail.com - http://levigo.de + https://levigo.de @@ -57,7 +57,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.17 + 2.22.2 -Xmx1024m -Xms1024m -XX:MaxPermSize=512m @@ -74,7 +74,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -100,14 +100,14 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://oss.sonatype.org/ - true + central + true + uploaded