Update main.yml

Author: zspitzer

.github/workflows/main.yml

@@ -15,13 +15,12 @@ on:
         default: '["6.2/stable/light", "7.0/stable/light"]'
 
 jobs:
-  setup:
+  build:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.extract-version.outputs.VERSION }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v4
@@ -43,36 +42,36 @@ jobs:
           VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
 
+      - name: Build extension
+        run: mvn -B -e -f pom.xml clean install -Dgoal=install
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: crypto-lex
+          path: target/*.lex
+
       - name: Cache Lucee files
         uses: actions/cache@v4
         with:
           path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
           key: lucee-downloads
 
-  build-and-test:
+  test:
     runs-on: ubuntu-latest
-    needs: setup
+    needs: build
     strategy:
       fail-fast: false
       matrix:
         lucee: ${{ fromJSON(inputs.luceeVersions || vars.LUCEE_TEST_VERSIONS || '["6.2/stable/light", "7.0/snapshot/light"]') }}
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - name: Download extension artifact
+        uses: actions/download-artifact@v4
         with:
-          java-version: '11'
-          distribution: 'adopt'
-
-      - name: Build and Install with Maven (for testing only)
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        run: |
-          echo "------- Maven Install (to create a local test build) -------";
-          mvn -B -e -f pom.xml clean install -Dgoal=install
+          name: crypto-lex
+          path: target
 
       - name: Checkout Lucee
         uses: actions/checkout@v4
@@ -92,43 +91,12 @@ jobs:
           testAdditional: ${{ github.workspace }}/tests
           LUCEE_ADMIN_PASSWORD: admin
 
-  upload-artifact:
-    runs-on: ubuntu-latest
-    needs: [setup, build-and-test]
-    if: needs.build-and-test.result == 'success'
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-
-      - name: Cache Maven packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Build
-        run: mvn -B -e -f pom.xml clean package -DskipTests
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: crypto-lex
-          path: target/*.lex
-
   deploy:
     runs-on: ubuntu-latest
-    needs: [setup, build-and-test]
-    if: github.event_name == 'workflow_dispatch' && inputs.deploy && needs.build-and-test.result == 'success'
+    needs: [build, test]
+    if: github.event_name == 'workflow_dispatch' && inputs.deploy && needs.test.result == 'success'
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v4
@@ -156,13 +124,13 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         run: |
-          if [[ "${{ needs.setup.outputs.version }}" == *-SNAPSHOT ]]; then
-            echo "------- Maven Deploy snapshot on ${{ github.event_name }} -------";
+          if [[ "${{ needs.build.outputs.version }}" == *-SNAPSHOT ]]; then
+            echo "------- Maven Deploy snapshot -------";
             mvn -B -e -f pom.xml clean deploy -Dgoal=deploy --settings maven-settings.xml
-          elif [[ "${{ needs.setup.outputs.version }}" == *-ALPHA ]]; then
-            echo "------- Maven Install alpha on ${{ github.event_name }} -------";
+          elif [[ "${{ needs.build.outputs.version }}" == *-ALPHA ]]; then
+            echo "------- Maven Install alpha -------";
             mvn -B -e -f pom.xml clean install -Dgoal=install --settings maven-settings.xml
           else
-            echo "------- Maven Deploy release on ${{ github.event_name }} -------";
+            echo "------- Maven Deploy release -------";
             mvn -B -e -f pom.xml clean deploy -Dgoal=deploy -DperformRelease=true --settings maven-settings.xml
           fi