ChatGPT improved workflows

Author: oh-dan

.github/workflows/branch-build-and-publish.yml

@@ -38,6 +38,7 @@ jobs:
             --non-recursive org.codehaus.mojo:exec-maven-plugin:3.5.1:exec)
           if [[ "$BASE_VER" != *-SNAPSHOT ]]; then
             echo "Branch workflow skipped: version '$BASE_VER' is not a SNAPSHOT"
+            echo "new_version=" >> $GITHUB_OUTPUT
             exit 0
           fi
           # Replace -SNAPSHOT with -SHORT_SHA-RUN_ATTEMPT
@@ -46,10 +47,30 @@ jobs:
           echo "new_version=${NEW_VER}" >> $GITHUB_OUTPUT
           echo "Using ${NEW_VER}"
 
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    needs: prepare
+    if: ${{ needs.prepare.outputs.new_version != '' }}
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-java@v4.0.0
+        with:
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: maven
+      - name: Set version
+        run: mvn -q -DnewVersion="${{ needs.prepare.outputs.new_version }}" -DgenerateBackupPoms=false versions:set
+      - name: Run reactor tests
+        run: |
+          mvn -B -pl '!modules/agent' test
+          mvn -B -pl modules/agent -DskipNativeBuild=true test
+
   macos:
     name: macOS (x86_64 + arm64)
     runs-on: macos-14
     needs: prepare
+    if: ${{ needs.prepare.outputs.new_version != '' }}
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-java@v4.0.0
@@ -78,6 +99,7 @@ jobs:
     name: Linux (x86_32 + x86_64 + aarch64 cross)
     runs-on: ubuntu-22.04
     needs: prepare
+    if: ${{ needs.prepare.outputs.new_version != '' }}
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-java@v4.0.0
@@ -147,6 +169,7 @@ jobs:
     name: Windows (x86 + x64)
     runs-on: windows-latest
     needs: prepare
+    if: ${{ needs.prepare.outputs.new_version != '' }}
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-java@v4.0.0
@@ -174,7 +197,8 @@ jobs:
 
   deploy-reactor:
     name: Deploy non-agent modules
-    needs: [prepare, macos, linux-x, windows-x86]
+    needs: [prepare, tests, macos, linux-x, windows-x86]
+    if: ${{ github.event_name == 'push' && needs.prepare.outputs.new_version != '' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
@@ -210,7 +234,8 @@ jobs:
 
   publish-agent-classifiers:
     name: Publish agent POM + native classifiers
-    needs: [prepare, macos, linux-x, windows-x86, deploy-reactor]
+    needs: [prepare, tests, macos, linux-x, windows-x86, deploy-reactor]
+    if: ${{ github.event_name == 'push' && needs.prepare.outputs.new_version != '' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
@@ -277,6 +302,11 @@ jobs:
           CLASSIFIERS=""
           TYPES=""
 
+          if [ -z "$CLASSIFIER_JARS" ]; then
+            echo "Error: no classifier JARs found to publish"
+            exit 1
+          fi
+
           if [ -n "$CLASSIFIER_JARS" ]; then
             echo "Found classifier JARs:"
             echo "$CLASSIFIER_JARS"

.github/workflows/main-publish-pom-version.yml

@@ -37,6 +37,22 @@ jobs:
           echo "version=${VER}" >> $GITHUB_OUTPUT
           echo "Publishing version ${VER}"
 
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-java@v4.0.0
+        with:
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: maven
+      - name: Run reactor tests
+        run: |
+          mvn -B -pl '!modules/agent' test
+          mvn -B -pl modules/agent -DskipNativeBuild=true test
+
   macos:
     name: macOS (x86_64 + arm64)
     runs-on: macos-14
@@ -158,7 +174,7 @@ jobs:
 
   deploy-reactor:
     name: Deploy non-agent modules
-    needs: [prepare, macos, linux-x, windows-x86]
+    needs: [prepare, tests, macos, linux-x, windows-x86]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
@@ -194,7 +210,7 @@ jobs:
 
   publish-agent-classifiers:
     name: Publish agent POM + native classifiers
-    needs: [prepare, macos, linux-x, windows-x86, deploy-reactor]
+    needs: [prepare, tests, macos, linux-x, windows-x86, deploy-reactor]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
@@ -258,6 +274,11 @@ jobs:
           CLASSIFIERS=""
           TYPES=""
 
+          if [ -z "$CLASSIFIER_JARS" ]; then
+            echo "Error: no classifier JARs found to publish"
+            exit 1
+          fi
+
           if [ -n "$CLASSIFIER_JARS" ]; then
             echo "Found classifier JARs:"
             echo "$CLASSIFIER_JARS"