julia-actions/julia-runtest
1
0
Fork 0
mirror of https://github.com/julia-actions/julia-runtest.git synced 2026-02-24 00:46:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Ian Butterworth
2025-11-16 21:08:28 -05:00
parent 8278f957fd
commit 7def07b61f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test_harness.jl
View File

@@ -25,10 +25,16 @@ if haskey(ENV, "GITHUB_SHA") && get(ENV, "GITHUB_EVENT_NAME", "") == "pull_reque
# Check if there's any difference between the merge commit and the PR head # Check if there's any difference between the merge commit and the PR head
# In GitHub Actions, HEAD^2 is the PR head (second parent of merge commit) # In GitHub Actions, HEAD^2 is the PR head (second parent of merge commit)
# Compare tree hashes to check if content actually differs # First check if HEAD^2 exists (i.e., this is actually a merge commit)
merge_tree = chomp(read(`git rev-parse HEAD:`, String)) if success(`git rev-parse --verify --quiet HEAD^2`)
pr_tree = chomp(read(`git rev-parse HEAD^2:`, String)) # Compare tree hashes to check if content actually differs
has_diff = merge_tree != pr_tree merge_tree = chomp(read(`git rev-parse HEAD:`, String))
pr_tree = chomp(read(`git rev-parse HEAD^2:`, String))
has_diff = merge_tree != pr_tree
else
# Not a merge commit, so no difference to report
has_diff = false
end
if has_diff if has_diff
base_branch = isempty(base_branch_name) ? "the base branch" : "'$base_branch_name'" base_branch = isempty(base_branch_name) ? "the base branch" : "'$base_branch_name'"