From a4e2d0ed844612f01e36ab497ae8bc0807851d15 Mon Sep 17 00:00:00 2001
From: Wim Velzeboer <wim@velzeboer.nl>
Date: Mon, 30 Mar 2026 13:39:03 +0100
Subject: [PATCH] Fix pipeline

---
 .github/workflows/publish.yml | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 22ce98b..b10578e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -33,33 +33,23 @@ jobs:
         run: |
           sf config set target-dev-hub SFDX-ENV --global
 
-      - name: Get branch name
-        id: get-branch-name
-        run: |
-          if [ "${{ github.event_name }}" == "pull_request" ]; then
-            echo "Branch name: ${{ github.head_ref }}"
-            echo "BRANCH_NAME=${{ github.head_ref }}" >> $GITHUB_ENV
-          else
-            echo "Branch name: ${GITHUB_REF#refs/heads/}"
-            echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
-          fi
-
       - name: Fetching Latest Package Version Id
         run: |
-          DATA=`sf package version list --packages "fflibApexExtensions" --target-dev-hub SFDX-ENV --branch $BRANCH_NAME --json`
-          LATEST_VERSION=`echo "$DATA" | jq '.result[-1]'`
-         
-          VERSION=`echo "$LATEST_VERSION" | jq -r '.Version'`
-          VERSION_NAME=`echo "$LATEST_VERSION" | jq -r '.Name'`
-          VERSION_ID=`echo "$LATEST_VERSION" | jq -r '.SubscriberPackageVersionId'`
-          
-          echo "Version: $VERSION"
-          echo "Version Name: $VERSION_NAME"
+          VERSION_ID=`cat sfdx-project.json | jq -r '.packageAliases | to_entries | [last] | .[0].value '`
           echo "Version ID: $VERSION_ID"
           
+          JSON=`sf package version list --packages "fflibApexExtensions" --target-dev-hub SFDX-ENV --json`
+          DATA=`echo "$JSON" | jq -r --arg VERSION "$VERSION_ID" '.result | .[] | select(.SubscriberPackageVersionId == $VERSION)'`
+          
+          VERSION_NUMBER=`echo "$DATA" | jq -r '.Version'`
+          echo "Version: $VERSION_NUMBER"
+          
+          VERSION_NAME=`echo "$DATA" | jq -r '.Name'`
+          echo "Version Name: $VERSION_NAME"
+          
           echo "PACKAGE_VERSION_ID=$VERSION_ID" >> "$GITHUB_ENV"
-          echo "PACKAGE_VERSION_NAME=$VERSION_ID" >> "$GITHUB_ENV"
-          echo "PACKAGE_VERSION=$VERSION" >> "$GITHUB_ENV"
+          echo "PACKAGE_VERSION_NAME=$VERSION_NAME" >> "$GITHUB_ENV"          
+          echo "PACKAGE_VERSION=$VERSION_NUMBER" >> "$GITHUB_ENV"
 
       - name: Promoting BETA Package Version
         run: |