Merge branch 'master' into development

Author: lmajano

.github/workflows/release.yml

@@ -15,70 +15,28 @@ on:
           required: false
           default: false
           type: boolean
-      doTests:
-        description: 'Run tests before the release'
-        required: false
-        default: true
-        type: boolean
 
 env:
   MODULE_ID: cbvalidation
+  SNAPSHOT: ${{ inputs.snapshot || false }}
 
 jobs:
-  ##########################################################################################
-  # Module Tests
-  ##########################################################################################
-  tests:
-    if: ${{ inputs.doTests }}
-    secrets: inherit
-    uses: ./.github/workflows/tests.yml
-
-  ##########################################################################################
-  # Format Source Code
-  # This only fires on `development`, stable releases should not have auto-formatting
-  ##########################################################################################
-  format:
-    name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
-    if: ${{ inputs.snapshot && ( success() || !inputs.doTests ) }}
-    needs: [ tests ]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Auto-format
-        uses: Ortus-Solutions/[email protected]
-        with:
-          cmd: run-script format
-
-      - name: Commit Format Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Apply cfformat changes
-
   ##########################################################################################
   # Build & Publish
   ##########################################################################################
   build:
     name: Build & Publish
-    if: ${{ success() || !inputs.doTests }}
-    needs: [ tests, format ]
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: "temurin"
-          java-version: "11"
-
       - name: Setup CommandBox
         uses: Ortus-Solutions/[email protected]
         with:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 
-      - name: Setup Environment Variables For Build Process
+      - name: "Setup Environment Variables For Build Process"
         id: current_version
         run: |
           echo "VERSION=`cat box.json | jq '.version' -r`" >> $GITHUB_ENV
@@ -93,7 +51,7 @@ jobs:
 
       - name: Update changelog [unreleased] with latest version
         uses: thomaseizinger/[email protected]
-        if: ${{ !inputs.snapshot }}
+        if: env.SNAPSHOT == 'false'
         with:
           changelogPath: ./changelog.md
           tag: v${{ env.VERSION }}
@@ -105,7 +63,7 @@ jobs:
 
       - name: Commit Changelog To Master
         uses: EndBug/[email protected]
-        if: ${{ !inputs.snapshot }}
+        if: env.SNAPSHOT == 'false'
         with:
           author_name: Github Actions
           author_email: [email protected]
@@ -114,7 +72,7 @@ jobs:
 
       - name: Tag Version
         uses: rickstaa/[email protected]
-        if: ${{ !inputs.snapshot }}
+        if: env.SNAPSHOT == 'false'
         with:
           tag: "v${{ env.VERSION }}"
           force_push_tag: true
@@ -136,7 +94,7 @@ jobs:
       - name: Create Github Release
         uses: taiki-e/[email protected]
         continue-on-error: true
-        if: ${{ !inputs.snapshot }}
+        if: env.SNAPSHOT == 'false'
         with:
           title: ${{ env.VERSION }}
           changelog: changelog.md
@@ -146,18 +104,23 @@ jobs:
   ##########################################################################################
   # Prep Next Release
   ##########################################################################################
-  prep-next-release:
+  prep_next_release:
     name: Prep Next Release
-    if: ${{ !inputs.snapshot && success() }}
-    needs: [ build ]
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-20.04
+    needs: [ build ]
     steps:
       # Checkout development
       - name: Checkout Repository
         uses: actions/checkout@v3
         with:
           ref: development
 
+      - name: Setup CommandBox
+        uses: Ortus-Solutions/[email protected]
+        with:
+          forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
+
       - name: Download build artifacts
         uses: actions/download-artifact@v2
         with:

.github/workflows/snapshot.yml

@@ -6,9 +6,38 @@ on:
       - 'development'
 
 jobs:
-  call-workflow:
+  ##########################################################################################
+  # Module Tests
+  ##########################################################################################
+  tests:
+    secrets: inherit
+    uses: ./.github/workflows/tests.yml
+
+  ##########################################################################################
+  # Format Source Code
+  ##########################################################################################
+  format:
+    name: Code Auto-Formatting
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Auto-format
+        uses: Ortus-Solutions/[email protected]
+        with:
+          cmd: run-script format
+
+      - name: Commit Format Changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Apply cfformat changes
+
+  ##########################################################################################
+  # Release it
+  ##########################################################################################
+  release:
     uses: ./.github/workflows/release.yml
+    needs: [ tests, format ]
     secrets: inherit
     with:
-      doTests: true
       snapshot: true