diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
| commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
| tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /.gitpod.yml | |
| parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) | |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to '.gitpod.yml')
| -rw-r--r-- | .gitpod.yml | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index 684f9a8e5a2..19785aba125 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -51,14 +51,11 @@ tasks: [[ -f /workspace/gitpod_start_time.sh ]] && source /workspace/gitpod_start_time.sh SECONDS=0 cd /workspace/gitlab-development-kit - make gitlab-update - make gitlab-shell-update - make gitlab-workhorse-update # update GDK - if [ "$GITLAB_UPDATE_GDK" == true ]; then - echo "$(date) – Updating GDK" | tee -a /workspace/startup.log - gdk update - fi + echo "$(date) – Updating GDK" | tee -a /workspace/startup.log + export DEFAULT_BRANCH=$(git branch --show-current) + gdk config set gitlab.default_branch "$DEFAULT_BRANCH" + gdk update # ensure gdk.yml has correct instance settings gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++') gdk config set gitlab.rails.port 443 @@ -79,7 +76,7 @@ tasks: make gitlab-db-migrate fi cd /workspace/gitlab-development-kit/gitlab - echo "--- on branch: $(git branch --show-current)" + echo "--- on branch: $DEFAULT_BRANCH" echo "--- installing lefthook" bundle exec lefthook install echo "--- resetting db/structure.sql" @@ -122,11 +119,11 @@ ports: vscode: extensions: + - GitLab.gitlab-workflow - rebornix.ruby@0.28.1 - wingrunr21.vscode-ruby@0.28.0 - karunamurti.haml@1.4.1 - - octref.vetur@0.36.0 - - dbaeumer.vscode-eslint@2.2.6 - - GitLab.gitlab-workflow@3.56.0 - - DavidAnson.vscode-markdownlint@0.47.0 + - octref.vetur@0.37.3 + - dbaeumer.vscode-eslint@2.4.0 + - DavidAnson.vscode-markdownlint@0.49.0 - esbenp.prettier-vscode |