Compare commits

..

9 Commits

Author SHA1 Message Date
dependabot[bot]
7efd635293 Bump actions/checkout from 5.0.0 to 6.0.0 (#157)
Bumps [actions/checkout](https://github.com/actions/checkout) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](08c6903cd8...1af3b93b68)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-01 16:23:02 +01:00
Ian Butterworth
d60b785c6f Update test_harness.jl 2025-11-23 10:24:12 -05:00
Ian Butterworth
80da54fb1f Update test_harness.jl
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-11-23 10:24:12 -05:00
Ian Butterworth
2e39f09cda Revert "revertme: disable buildpkg"
This reverts commit fc4beef44a.
2025-11-23 10:24:12 -05:00
Ian Butterworth
4106f361b2 revertme: disable buildpkg 2025-11-23 10:24:12 -05:00
Ian Butterworth
1cc5cea014 fix 2025-11-23 10:24:12 -05:00
Ian Butterworth
8b0e8344b9 fix 2025-11-23 10:24:12 -05:00
Ian Butterworth
639d29024e fix 2025-11-23 10:24:12 -05:00
Ian Butterworth
ee4584ffbd Compare tree hashes instead of using git diff
Comparing tree hashes is more accurate for detecting content differences
between the merge commit and PR head, avoiding false positives when
the content is identical but commit SHAs differ.
2025-11-23 10:24:12 -05:00
4 changed files with 16 additions and 38 deletions

View File

@@ -51,7 +51,7 @@ jobs:
steps:
- name: Checkout Example.jl
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
repository: julia-actions/Example.jl
@@ -60,7 +60,7 @@ jobs:
shell: bash
- name: Checkout julia-runtest
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
path: ./.github/actions/julia-runtest
@@ -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

View File

@@ -51,7 +51,7 @@ jobs:
steps:
- name: Checkout julia-runtest
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
- uses: julia-actions/setup-julia@5c9647d97b78a5debe5164e9eec09d653d29bd71 # v2.6.1
with:

View File

@@ -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 }}

View File

@@ -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'"