diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /.gitpod.yml | |
parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to '.gitpod.yml')
-rw-r--r-- | .gitpod.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index 19785aba125..0a047495ac6 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -53,7 +53,7 @@ tasks: cd /workspace/gitlab-development-kit # update GDK echo "$(date) – Updating GDK" | tee -a /workspace/startup.log - export DEFAULT_BRANCH=$(git branch --show-current) + export DEFAULT_BRANCH=$(git --git-dir=gitlab/.git branch --show-current) gdk config set gitlab.default_branch "$DEFAULT_BRANCH" gdk update # ensure gdk.yml has correct instance settings @@ -92,7 +92,7 @@ tasks: # Give Gitpod a few more seconds to set up everything ... sleep 5 printf "$(date) – GitLab is up (took ~%.1f minutes)\n" "$((10*$SECONDS/60))e-1" | tee -a /workspace/startup.log - gp preview $(gp url 3000) || true + gp preview $(gp url 3000) --external || true PREBUILD_LOG=(/workspace/.gitpod/prebuild-log-*) [[ -f /workspace/gitpod_start_time.sh ]] && printf "Took %.1f minutes from https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitpod.yml being executed through to completion %s\n" "$((10*(($(date +%s)-${START_UNIXTIME}))/60))e-1" "$([[ -f "$PREBUILD_LOG" ]] && echo "With Prebuilds")" ) |