Skip to content

Make tests pass when run within a PR #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mernst merged 3 commits into from
May 11, 2025
Merged

Make tests pass when run within a PR #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5321a47
Diagnostics
mernst May 11, 2025
31f9042
Make tests pass when run within a PR
mernst May 11, 2025
79e0a37
Undo a change
mernst May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions tests/git-clone-related-test/test-git-clone-related.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,14 @@ goaldir=$(mktemp -d 2>/dev/null || mktemp -d -t 'goaldir')
rm -rf "$startdir" "$goaldir"

git clone --branch "$START_BRANCH" "$START_REPO" "$startdir" -q --single-branch --depth 1
# $ARGS should not be quoted
# shellcheck disable=SC2086
# This test might itself be running under CI, so unset the variables that
# `ci-info` examines.
unset SYSTEM_PULLREQUEST_TARGETBRANCH;
unset BUILD_SOURCEBRANCH
unset TRAVIS
unset CIRCLE_COMPARE_URL
unset GITHUB_HEAD_REF
# shellcheck disable=SC2086 # $ARGS should not be quoted
(cd "$startdir" && "${PLUME_SCRIPTS}"/git-clone-related $ARGS "$goaldir")
clonedrepo=$(git -C "$goaldir" config --get remote.origin.url)
# git 2.22 and later has `git branch --show-current`; CircleCI doesn't have that version yet.
Expand All @@ -38,12 +44,12 @@ clonedbranch=$(git -C "$goaldir" rev-parse --abbrev-ref HEAD)
rm -rf "$startdir" "$goaldir"

if [ "$clonedrepo" != "$GOAL_REPO" ] ; then
echo "test-git-clone-related \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
echo "test-git-clone-related.sh \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
echo "expected repo $GOAL_REPO, got: $clonedrepo"
exit 2
fi
if [ "$clonedbranch" != "$GOAL_BRANCH" ] ; then
echo "test-git-clone-related \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
echo "test-git-clone-related.sh \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
echo "expected branch $GOAL_BRANCH, got: $clonedbranch"
exit 2
fi