Skip to content

Fix CI build scripts to dynamically detect fork repository names #22020

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −2
Open

Fix CI build scripts to dynamically detect fork repository names #22020

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# test for 22020

FROM ubuntu:20.04

RUN apt-get update \
Expand Down
7 changes: 6 additions & 1 deletion hack/jenkins/build_iso.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ git config user.email "[email protected]"
if [ "$release" = false ]; then
# Update the user's PR with newly build ISO

git remote add ${ghprbPullAuthorLogin} [email protected]:${ghprbPullAuthorLogin}/minikube.git
# Dynamically determine the fork repository name from the PR URL or git remote
FORK_REPO_NAME=$(gh pr view ${ghprbPullId} --json headRepository --jq '.headRepository.name' 2>/dev/null || echo "minikube")

# Try SSH first, fallback to HTTPS if SSH fails
git remote add ${ghprbPullAuthorLogin} [email protected]:${ghprbPullAuthorLogin}/${FORK_REPO_NAME}.git || \
git remote add ${ghprbPullAuthorLogin} https://github.com/${ghprbPullAuthorLogin}/${FORK_REPO_NAME}.git
git fetch ${ghprbPullAuthorLogin}
git checkout -b ${ghprbPullAuthorLogin}-${ghprbSourceBranch} ${ghprbPullAuthorLogin}/${ghprbSourceBranch}

Expand Down
7 changes: 6 additions & 1 deletion hack/jenkins/kicbase_auto_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,12 @@ git config user.email "[email protected]"
if [ "$release" = false ]; then
# Update the user's PR with the newly built kicbase image.

git remote add ${ghprbPullAuthorLogin} [email protected]:${ghprbPullAuthorLogin}/minikube.git
# Dynamically determine the fork repository name from the PR URL or git remote
FORK_REPO_NAME=$(gh pr view ${ghprbPullId} --json headRepository --jq '.headRepository.name' 2>/dev/null || echo "minikube")

# Try SSH first, fallback to HTTPS if SSH fails
git remote add ${ghprbPullAuthorLogin} [email protected]:${ghprbPullAuthorLogin}/${FORK_REPO_NAME}.git || \
git remote add ${ghprbPullAuthorLogin} https://github.com/${ghprbPullAuthorLogin}/${FORK_REPO_NAME}.git
git fetch ${ghprbPullAuthorLogin}
git checkout -b ${ghprbPullAuthorLogin}-${ghprbSourceBranch} ${ghprbPullAuthorLogin}/${ghprbSourceBranch}

Expand Down