Merge pull request #1 from fullstackzach/new-branch

test

Author: fullstackzach

.github/scripts/commit-checker.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Checkout branch
+git checkout -q $1
+
+# Set variables
+BASE_BRANCH=$2
+msg_regex='(AAA|BBB|CCC)\-[0-9]+'
+
+# Initialize invalidCommit as false, will be set to true by any invalid commits
+invalidCommit=false
+# Find current branch name
+CURRENT_BRANCH=$(git branch --show-current)
+
+#echo "Current branch is:" $CURRENT_BRANCH
+# Find hash of commit most common ancestor, e.g. where branch began
+BRANCH_MERGE_BASE=$(git merge-base ${BASE_BRANCH} ${CURRENT_BRANCH})
+#echo "Branch merge base hash is:" $BRANCH_MERGE_BASE
+# Find all commits since common ancestor
+BRANCH_COMMITS=$(git rev-list ${BRANCH_MERGE_BASE}..HEAD)
+
+#echo $BRANCH_COMMITS
+
+# Check every commit message since ancestor for regex match
+for commit in $BRANCH_COMMITS; do
+    if git log --max-count=1 --format=%B $commit | tr '[a-z]' '[A-Z]' | grep -iqE "$msg_regex"; then
+        : #If commit matches regex, commit is valid, do nothing
+    else
+        # If commit doesn't match regex, commit isn't valid, print commit info
+        echo "************"
+        printf "Invalid commit message: \"%s\" and hash: %s\n" "$(git log --max-count=1 --format=%B $commit)" "$commit"
+        echo "************"
+        
+        # Set this variable to trigger rejection if any commit fails regex
+        invalidCommit=true
+    fi
+done
+# If any commit are invalid, print reject message
+if [ "$invalidCommit" == true ]; then
+    echo "Your push was rejected because at least one commit message on this branch is invalid"
+    echo "Please fix the commit message(s) and push again."
+    echo "https://help.github.com/en/articles/changing-a-commit-message"
+    echo "************"
+    exit 1
+elif [ "$invalidCommit" == false ]; then
+    echo "************"
+    echo "All commits are valid"
+    echo "************"
+    exit 0
+fi

.github/workflows/commit-checker.yml

@@ -14,49 +14,5 @@ jobs:
         ref: '${{ github.event.pull_request.base.ref }}'
 
     - name: Commit validation
-      run: |
-        # Checkout branch
-        git checkout -q ${{ github.event.pull_request.head.ref }}
-        
-        # Set variables
-        BASE_BRANCH=${{ github.event.pull_request.base.ref }}
-        msg_regex='(AAA|BBB|CCC)\-[0-9]+'
-        
-        # Initialize invalidCommit as false, will be set to true by any invalid commits
-        invalidCommit=false
-        # Find current branch name
-        CURRENT_BRANCH=$(git branch | grep ^\* | cut -d "*" -f 2 | cut -d " " -f 2)
-        #echo "Current branch is:" $CURRENT_BRANCH
-        # Find hash of commit most common ancestor, e.g. where branch began
-        BRANCH_MERGE_BASE=$(git merge-base ${BASE_BRANCH} ${CURRENT_BRANCH})
-        #echo "Branch merge base hash is:" $BRANCH_MERGE_BASE
-        # Find all commits since common ancestor
-        BRANCH_COMMITS=$(git rev-list ${BRANCH_MERGE_BASE}..HEAD)
-        #echo $BRANCH_COMMITS
-        # Check every commit message since ancestor for regex match
-        for commit in $BRANCH_COMMITS; do
-            if git log --max-count=1 --format=%B $commit | tr '[a-z]' '[A-Z]' | grep -iqE "$msg_regex"; then
-                : #If commit matches regex, commit is valid, do nothing
-            else
-                # If commit doesn't match regex, commit isn't valid, print commit info
-                echo "************"
-                printf "Invalid commit message: \"%s\" and hash: %s\n" "$(git log --max-count=1 --format=%B $commit)" "$commit"
-                echo "************"
-                
-                # Set this variable to trigger rejection if any commit fails regex
-                invalidCommit=true
-            fi
-        done
-        # If any commit are invalid, print reject message
-        if [ "$invalidCommit" == true ]; then
-            echo "Your push was rejected because at least one commit message on this branch is invalid"
-            echo "Please fix the commit message(s) and push again."
-            echo "https://help.github.com/en/articles/changing-a-commit-message"
-            echo "************"
-            exit 1
-        elif [ "$invalidCommit" == false ]; then
-            echo "************"
-            echo "All commits are valid"
-            echo "************"
-            exit 0
-        fi
+      run: bash ${GITHUB_WORKSPACE}/.github/scripts/commit-checker.sh ${{ github.event.pull_request.head.ref }} ${{ github.event.pull_request.base.ref }}
+        

README.md

@@ -1 +1,3 @@
 # gh-actions-playground
+
+test