Skip to content

jenkins: fetch refs before test commit rebase #4346

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

Open
trivikr wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −0
Open

jenkins: fetch refs before test commit rebase #4346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions jenkins/scripts/node-test-commit-pre.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,27 @@ echo $GIT_COMMITTER_NAME
echo $GIT_AUTHOR_NAME

git rebase --abort || true

# Refresh the refs used below in case the Jenkins checkout left a stale or
# shallow copy. If REBASE_ONTO is present locally without its parents, rebase
# can replay almost the entire Node.js history instead of only the PR commits.
fetch_from_origin() {
fetch_args="--no-tags"
if [ -f "$(git rev-parse --git-dir)/shallow" ]; then
fetch_args="${fetch_args} --unshallow"
fi

git fetch ${fetch_args} origin "$@"
}

if [ -n "${GIT_REMOTE_REF}" ]; then
fetch_from_origin "+${GIT_REMOTE_REF}:refs/remotes/origin/_jenkins_local_branch"
fi

if [ -n "${REBASE_ONTO}" ]; then
fetch_from_origin "${REBASE_ONTO}"
fi

git checkout -f refs/remotes/origin/_jenkins_local_branch
git config user.name
git config user.email
Expand Down