Merge pull request #85 from SweepMe/improve-semilinear-script

Use source commit hash instead of branch name to support PRs from forks
SweepMe · Jul 17, 2024 · eff6e5a · eff6e5a
2 parents 6d4a604 + e056430
commit eff6e5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/Check-SemilinearHistory.ps1 b/.github/Check-SemilinearHistory.ps1
@@ -2,15 +2,14 @@ Param(
     [Parameter(Mandatory)]
     [string]$targetBranch,
     [Parameter(Mandatory)]
-    [string]$sourceBranch
+    [string]$commitSource
 )
 
 $ErrorActionPreference = 'Stop'
 
 git fetch origin $targetBranch
 $commitTarget = git rev-parse "origin/$targetBranch"
-git fetch origin $sourceBranch
-$commitSource = git rev-parse "origin/$sourceBranch"
+git fetch origin $commitSource
 
 # verify that source branch originates from the latest commit of the target branch
 # (i.e. a fast-forward merge could be performed)

diff --git a/.github/workflows/semilinear_history.yml b/.github/workflows/semilinear_history.yml
@@ -16,4 +16,4 @@ jobs:
     - name: Check Semilinear History
       shell: pwsh
       run: |
-        .\.github\Check-SemilinearHistory.ps1 -targetBranch ${{ github.base_ref }} -sourceBranch ${{ github.head_ref }}
+        .\.github\Check-SemilinearHistory.ps1 -targetBranch ${{ github.base_ref }} -commitSource ${{ github.event.pull_request.head.sha }}