Update test_harness.jl

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/ci.yml

@@ -71,7 +71,7 @@ jobs:
 
       - uses: julia-actions/cache@d10a6fd8f31b12404a54613ebad242900567f2b9 # v2.1.0
 
-      # - uses: julia-actions/julia-buildpkg@e3eb439fad4f9aba7da2667e7510e4a46ebc46e1 # v1.7.0
+      - uses: julia-actions/julia-buildpkg@e3eb439fad4f9aba7da2667e7510e4a46ebc46e1 # v1.7.0
 
       - uses: ./.github/actions/julia-runtest
 

action.yml

@@ -66,39 +66,9 @@ runs:
         prefix=( ${{ inputs.prefix }} )
         [[ -n ${prefix[*]} ]] && julia_cmd=( "${prefix[@]}" "${julia_cmd[@]}" )
 
-        # Determine which signal to use for diagnostics based on OS
-        if [[ "$(uname -s)" == "Darwin" ]] || [[ "$(uname -s)" == *"BSD"* ]]; then
-          info_signal="INFO"
-        else
-          info_signal="USR1"
-        fi
-
-        # Set up signal handler to send diagnostic signal when we receive SIGTERM
-        # (which GitHub Actions sends on timeout/cancellation)
-        trap_handler() {
-          echo "::warning::Timeout/cancellation detected - sending SIG${info_signal} to Julia process for diagnostic output"
-          if kill -0 "$julia_pid" 2>/dev/null; then
-            kill -s "$info_signal" "$julia_pid" 2>/dev/null || true
-            # Give Julia a moment to print diagnostics before we get killed
-            sleep 2
-          fi
-          # Re-send SIGTERM to Julia to ensure it terminates
-          kill -TERM "$julia_pid" 2>/dev/null || true
-          wait "$julia_pid" 2>/dev/null || true
-          exit 124  # Standard timeout exit code
-        }
-        trap trap_handler SIGTERM SIGINT
-
-        # Run the Julia command in the background so we can handle signals
+        # Run the Julia command
         echo "::debug::Executing Julia: ${julia_cmd[*]}"
-        "${julia_cmd[@]}" &
-        julia_pid=$!
-
-        # Wait for Julia to complete
-        wait "$julia_pid"
-        exit_code=$?
-        
-        exit $exit_code
+        "${julia_cmd[@]}"
       shell: bash
       env:
         ANNOTATE: ${{ inputs.annotate }}

test_harness.jl

@@ -25,8 +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
         # In GitHub Actions, HEAD^2 is the PR head (second parent of merge commit)
-        # success() returns true if the command exits with 0 (no differences)
-        has_diff = !success(`git diff --quiet --exit-code HEAD^2 HEAD`)
+        # First check if HEAD^2 exists (i.e., this is actually a merge commit)
+        if success(`git rev-parse --verify --quiet HEAD^2`)
+            # Compare tree hashes to check if content actually differs
+            merge_tree = chomp(read(`git rev-parse HEAD^\{tree\}`, String))
+            pr_tree = chomp(read(`git rev-parse HEAD^2^\{tree\}`, String))
+            has_diff = merge_tree != pr_tree
+        else
+            # Not a merge commit, so no difference to report
+            has_diff = false
+        end
 
         if has_diff
             base_branch = isempty(base_branch_name) ? "the base branch" : "'$base_branch_name'"