Skip to content

TOOL-12604 linux-pkg's "push-merge.sh" script does not work for internal github repositories (#216) #233

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
prakashsurya merged 1 commit into from
May 6, 2022
Merged

TOOL-12604 linux-pkg's "push-merge.sh" script does not work for internal github repositories (#216) #233

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
8 changes: 7 additions & 1 deletion push-merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,14 @@ set -o pipefail
echo "Running: git rev-parse refs/heads/repo-HEAD-saved"
saved_ref=$(git rev-parse refs/heads/repo-HEAD-saved) ||
die "Failed to read local ref refs/heads/repo-HEAD-saved"

git_url="$DEFAULT_PACKAGE_GIT_URL"
if [[ -n "$FETCH_GIT_TOKEN" ]] && [[ "$git_url" == https://github.com/* ]]; then
git_url="${git_url/https:\/\//https:\/\/${FETCH_GIT_TOKEN}@}"
fi

echo "Running: git ls-remote $DEFAULT_PACKAGE_GIT_URL refs/heads/$DEFAULT_GIT_BRANCH"
remote_ref=$(git ls-remote "$DEFAULT_PACKAGE_GIT_URL" "refs/heads/$DEFAULT_GIT_BRANCH" |
remote_ref=$(git ls-remote "$git_url" "refs/heads/$DEFAULT_GIT_BRANCH" |
awk '{print $1}') ||
die "Failed to read remote ref refs/heads/$DEFAULT_GIT_BRANCH"
set +o pipefail
Expand Down