streamline CI

Author: alexlanz

.github/workflows/main.yml

@@ -1,14 +1,29 @@
-name: Test
+name: Main
 
-on:
-  pull_request:
-    types: [ opened, reopened, synchronize ]
+on: push
 
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   test:
-    name: Tests
-    uses: ./.github/workflows/test.yml
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v5
+      - uses: aboutbits/github-actions-java/setup-with-maven@v4
+        with:
+          java-version: 21
+      - name: Test
+        env:
+          GITHUB_USER_NAME: ${{ github.actor }}
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: >-
+          ./mvnw
+          -s $GITHUB_WORKSPACE/.github/workflows/maven-settings.xml
+          --batch-mode
+          --fail-fast
+          -Dsurefire.failIfNoSpecifiedTests=false
+          test
+        shell: bash

.github/workflows/publish.yml

@@ -1,48 +1,43 @@
-name: Publish package to GitHub Packages
+name: Release Package
+
 on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Version name to publish (eg: x.x.x)"
+        description: "Version (eg: x.x.x)"
         type: string
         required: true
 
 jobs:
-  publish:
-    timeout-minutes: 15
+  build-and-publish:
     runs-on: ubuntu-24.04
+    timeout-minutes: 15
     permissions:
       contents: read
       packages: write
-
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: aboutbits/github-actions-java/setup-and-install@v3
-
-      - name: Set Version
-        run: sed -i 's|<version>BUILD-SNAPSHOT</version>|<version>${{ github.event.inputs.version }}</version>|g' pom.xml
-
+      - uses: actions/checkout@v5
+        with:
+          token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+      - uses: aboutbits/github-actions-base/git-setup@v2
+      - uses: aboutbits/github-actions-java/setup-with-maven@v4
+        with:
+          java-version: 21
+      - uses: aboutbits/github-actions-java/set-version-with-maven@v4
+        with:
+          version: "${{ github.event.inputs.version }}"
       - name: Publish package
-        run: mvn --batch-mode deploy
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  release:
-    timeout-minutes: 5
-    runs-on: ubuntu-24.04
-    needs: publish
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create GitHub release
-        uses: actions/github-script@v7
+          GITHUB_USER_NAME: ${{ github.actor }}
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: mvn -s $GITHUB_WORKSPACE/.github/workflows/maven-settings.xml --batch-mode deploy
+        shell: bash
+      - uses: aboutbits/github-actions-base/git-commit-and-push-all@v2
+        with:
+          message: '${{ github.event.inputs.version }}'
+      - uses: aboutbits/github-actions-base/git-create-or-update-tag@v2
+        with:
+          tag-name: 'v${{ github.event.inputs.version }}'
+      - uses: aboutbits/github-actions-base/github-create-release@v2
         with:
-          script: |
-            github.rest.repos.createRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              tag_name: '${{ github.event.inputs.version }}',
-              name: 'Release ${{ github.event.inputs.version }}',
-              prerelease: '${{ github.event.inputs.version }}'.includes('RC')
-            })
+          tag-name: 'v${{ github.event.inputs.version }}'

.github/workflows/test.yml

@@ -20,17 +20,17 @@ Add this library to the classpath by adding the following maven dependency. Vers
 The [CustomAccessorNamingStrategy.java](src%2Fmain%2Fjava%2Fit%2Faboutbits%2Fmapstruct%2Fspi%2FCustomAccessorNamingStrategy.java) adds support for Lombok's `@With` methods.
 By default, Lombok would treat these generated functions as accessors and would try to map them.
 
-## Local development:
+## Local Development
 
 To use this library as a local development dependency, you can simply refer to the version `BUILD-SNAPSHOT`.
 
 Check out this repository and run the maven goal `install`. This will build and install this library as version `BUILD-SNAPSHOT` into your local maven cache.
 
 Note that you may have to tell your IDE to reload your main maven project each time you build the library.
 
-## Building and releasing a new version:
+## Build & Publish
 
-To create a new version of this package and push it to the maven registry, you will have to use the GitHub actions workflow and manually trigger it.
+To build and publish the chart, visit the GitHub Actions page of the repository and trigger the workflow "Release Package" manually.
 
 ## Information