Skip to content

Commit 2533258

Browse files
committed
attempt to actually run a silent merge conflict
1 parent 1f0e130 commit 2533258

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

.github/workflows/silent-merge-check.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,19 @@ jobs:
9393
fi
9494
9595
# --- Run build/tests ---
96-
# git fetch origin pull/$pr/head:pr-$pr
97-
# git checkout pr-$pr
98-
#
99-
# ci_failed=false
100-
# ./ci/test_run_all.sh || {
101-
# echo "PR #$pr CI script failed."
102-
# ci_failed=true
103-
# }
104-
# if [ "$ci_failed" = true ]; then
105-
# conclusion=failure
106-
# summary="CMake build or tests failed."
107-
# else
108-
# conclusion=success
109-
# summary="CMake build and tests passed."
110-
# fi
96+
git fetch origin pull/$pr/head:pr-$pr
97+
git checkout pr-$pr
98+
99+
if ! output=$(./ci/test_run_all.sh 2>&1); then
100+
echo "PR #$pr CI script failed."
101+
echo "$output"
102+
conclusion=failure
103+
summary="Periodic silent merge check has failed. <br><br> Details of failure: https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
104+
else
105+
conclusion=success
106+
summary="Periodic silent merge check has passed."
107+
fi
111108
112-
conclusion=failure
113-
summary="Periodic silent merge check has passed! \n\n Details of failure: https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
114109
# set -o xtrace
115110
# docker buildx build -t "$CONTAINER_NAME" $DOCKER_BUILD_CACHE_ARG --file "./ci/lint_imagefile" .
116111
# CIRRUS_PR_FLAG=""

0 commit comments

Comments
 (0)