From fd19682fac129f138327f823a9d42e050af01048 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Wed, 10 Apr 2024 02:15:33 +0530
Subject: [PATCH] Fix building for remote PR

---
 extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1 | 6 +++++-
 extension/BuildPhpExtension/private/Get-ExtensionSource.ps1 | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1 b/extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1
index 2202490..2c8880c 100644
--- a/extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1
+++ b/extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1
@@ -51,9 +51,13 @@ Function Get-ExtensionConfig {
                 Copy-Item $PSScriptRoot\..\config\stubs\$Extension.composer.json composer.json
             }
         }
+        $ref = $ExtensionRef
+        if ($ref -match 'refs/pull/(\d+)/merge') {
+            $ref = $Matches[1]
+        }
         $config = [PSCustomObject]@{
             name = $Extension
-            ref = $ExtensionRef
+            ref = $ref
             php_version = $PhpVersion
             arch = $Arch
             ts = $Ts
diff --git a/extension/BuildPhpExtension/private/Get-ExtensionSource.ps1 b/extension/BuildPhpExtension/private/Get-ExtensionSource.ps1
index 8e47fb1..f59ca61 100644
--- a/extension/BuildPhpExtension/private/Get-ExtensionSource.ps1
+++ b/extension/BuildPhpExtension/private/Get-ExtensionSource.ps1
@@ -23,7 +23,7 @@ function Get-ExtensionSource {
             }
             if($null -eq $ExtensionRef -or $ExtensionRef -eq '') {
                 if($env:GITHUB_EVENT_NAME -contains "pull_request") {
-                    $ExtensionRef = $env:GITHUB_HEAD_REF
+                    $ExtensionRef = $env:GITHUB_REF
                 } elseif($null -ne $env:GITHUB_REF_NAME) {
                     $ExtensionRef = $env:GITHUB_REF_NAME
                 } else {