From b1f9c693bd6833ebd86ef9de91f33c1c391cd8ae Mon Sep 17 00:00:00 2001
From: ryanformio <ryan@form.io>
Date: Tue, 19 Mar 2024 12:31:24 -0500
Subject: [PATCH] Get details

---
 .github/workflows/repo.yml | 52 +++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml
index 25fbfed0..87aefa62 100644
--- a/.github/workflows/repo.yml
+++ b/.github/workflows/repo.yml
@@ -1,7 +1,7 @@
-name: Build / Test / Publish
+name: Build & Test
 
 on:
-  # push:
+  push:
   pull_request:
     types: [opened, synchronize]
 
@@ -78,19 +78,17 @@ jobs:
           cmd: test
 
   publish:
-    if: github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'synchronize')
+    if: ${{ github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'synchronize') }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Fetch all history for all branches and tags
-  
+      - uses: actions/checkout@v2
+
       - name: Set up Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
-  
+
       - name: Restore node modules from cache
         uses: actions/cache@v3
         with:
@@ -98,29 +96,10 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-node-
-  
-      - name: Prepare version for publish
-        run: |
-          PR_NUMBER=$(echo ${{ github.event.number }})
-          CURRENT_VERSION=$(node -p "require('./package.json').version")
-          
-          # Explicitly fetch the master branch with its history
-          git fetch origin master:refs/remotes/origin/master
-          
-          # Verify if master branch was fetched
-          if git rev-parse --verify origin/master; then
-            echo "Master branch fetched successfully."
-            
-            # Use git log to count commits if git rev-list does not work as expected
-            SHORT_SHA=${GITHUB_SHA::7}
-            COMMIT_COUNT=$(git log master..HEAD --oneline | wc -l)
-            NEW_VERSION="${CURRENT_VERSION}-dev.${PR_NUMBER}.${COMMIT_COUNT}"
-            echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
-          else
-            echo "Failed to fetch master branch."
-            # Handle error or fallback scenario
-          fi       
-  
+
+      - name: Branch name
+        run: echo running on branch ${GITHUB_REF##*/}
+      
       - name: Set outputs
         id: vars
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
@@ -128,6 +107,15 @@ jobs:
       - name: Check outputs
         run: echo ${{ steps.vars.outputs.sha_short }}
 
+      - name: Prepare version for publish
+        id: prep
+        run: |
+          PR_NUMBER=$(echo ${{ github.event.number }})
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          NEW_VERSION="${CURRENT_VERSION}-dev.${PR_NUMBER}.0"
+          echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
+
       - name: Echo version for testing
         run: |
-          echo "Version to publish: $NEW_VERSION"
\ No newline at end of file
+          echo "Version to publish: $NEW_VERSION"
+          echo "Adds a commit to test increment"
\ No newline at end of file