[PETOSS-829] moved check for changes to explict step

Author: Ryan McCarthy

.github/workflows/publish-Oauth2Client-package.yml

@@ -19,6 +19,8 @@ jobs:
     outputs:
       # Used to conditionally run publish steps and notifications
       client_version: ${{steps.calc_version.outputs.version}}
+      should_publish: ${{steps.check_changes.outputs.has_changes}}
+
     permissions:
       contents: write
       pull-requests: write
@@ -32,18 +34,43 @@ jobs:
         path: Xero-NetStandard
         fetch-depth: 0  # Fetch all history for git diff
 
-    - name: Calculate OAuth2Client version
-      id: calc_version
+    - name: Check for changes
+      id: check_changes
       run: |
         # Get last client tag
         LAST_CLIENT_TAG=$(git tag -l 'client-*' --sort=-v:refname | head -n 1)
+        echo "Found last client tag: $LAST_CLIENT_TAG"
+        echo "last_client_tag=$LAST_CLIENT_TAG" >> $GITHUB_OUTPUT
+
+        if [ -z "$LAST_CLIENT_TAG" ]; then
+          echo "No previous client tag found. Treating as changed (initial release)."
+          echo "has_changes=true" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+
+        # Check if OAuth2Client files changed since last client tag
+        if git diff --name-only $LAST_CLIENT_TAG HEAD | grep -q 'Xero.NetStandard.OAuth2Client/'; then
+          echo "Changes detected in Xero.NetStandard.OAuth2Client/"
+          echo "has_changes=true" >> $GITHUB_OUTPUT
+        else
+          echo "No changes detected in Xero.NetStandard.OAuth2Client/"
+          echo "has_changes=false" >> $GITHUB_OUTPUT
+        fi
+      working-directory: Xero-NetStandard
+      env:
+        GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+    - name: Calculate OAuth2Client version
+      id: calc_version
+      if: steps.check_changes.outputs.has_changes == 'true'
+      run: |
+        LAST_CLIENT_TAG="${{ steps.check_changes.outputs.last_client_tag }}"
         
         if [ -z "$LAST_CLIENT_TAG" ]; then
           # No previous client tag, start with version from csproj
           CURRENT_VERSION=$(grep '<Version>' ./Xero.NetStandard.OAuth2Client/Xero.NetStandard.OAuth2Client.csproj | sed 's/.*<Version>\(.*\)<\/Version>.*/\1/')
           echo "No previous client tag found, using csproj version: $CURRENT_VERSION"
           echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "should_publish=true" >> $GITHUB_OUTPUT
           exit 0
         fi
         
@@ -71,28 +98,18 @@ jobs:
         fi
         echo "Detected bump type: $BUMP_TYPE"
         
-        # Check if OAuth2Client files changed since last client tag
-        if git diff --name-only $LAST_CLIENT_TAG HEAD | grep -q 'Xero.NetStandard.OAuth2Client/'; then
-          echo "OAuth2Client files have changed since $LAST_CLIENT_TAG"
-          
-          # Increment version based on bump type
-          IFS='.' read -r c1 c2 c3 <<< "$LAST_VERSION"
-          if [ "$BUMP_TYPE" == "major" ]; then
-            NEW_VERSION="$((c1 + 1)).0.0"
-          elif [ "$BUMP_TYPE" == "minor" ]; then
-            NEW_VERSION="${c1}.$((c2 + 1)).0"
-          else
-            NEW_VERSION="${c1}.${c2}.$((c3 + 1))"
-          fi
-          
-          echo "Incrementing version ($BUMP_TYPE): $LAST_VERSION -> $NEW_VERSION"
-          echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
-          echo "should_publish=true" >> $GITHUB_OUTPUT
+        # Increment version based on bump type
+        IFS='.' read -r c1 c2 c3 <<< "$LAST_VERSION"
+        if [ "$BUMP_TYPE" == "major" ]; then
+          NEW_VERSION="$((c1 + 1)).0.0"
+        elif [ "$BUMP_TYPE" == "minor" ]; then
+          NEW_VERSION="${c1}.$((c2 + 1)).0"
         else
-          echo "No changes to OAuth2Client since $LAST_CLIENT_TAG"
-          echo "version=$LAST_VERSION" >> $GITHUB_OUTPUT
-          echo "should_publish=false" >> $GITHUB_OUTPUT
+          NEW_VERSION="${c1}.${c2}.$((c3 + 1))"
         fi
+        
+        echo "Incrementing version ($BUMP_TYPE): $LAST_VERSION -> $NEW_VERSION"
+        echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
       working-directory: Xero-NetStandard
       env:
         GH_TOKEN: ${{secrets.GITHUB_TOKEN}}