summaryrefslogtreecommitdiff
path: root/.gitpod.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-18 10:34:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-18 10:34:06 +0000
commit859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch)
treed7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /.gitpod.yml
parent446d496a6d000c73a304be52587cd9bbc7493136 (diff)
downloadgitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to '.gitpod.yml')
-rw-r--r--.gitpod.yml12
1 files changed, 8 insertions, 4 deletions
diff --git a/.gitpod.yml b/.gitpod.yml
index dc1dbc1472d..950b06b40e7 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -13,7 +13,10 @@ tasks:
(
set -e
cd /workspace/gitlab-development-kit
- [[ ! -L /workspace/gitlab-development-kit/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
+ # GitLab FOSS
+ [[ -d /workspace/gitlab-foss ]] && ln -fs /workspace/gitlab-foss /workspace/gitlab-development-kit/gitlab
+ # GitLab
+ [[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
# reconfigure GDK
echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
@@ -21,7 +24,6 @@ tasks:
# run DB migrations
echo "$(date) – Running DB migrations" | tee -a /workspace/startup.log
make gitlab-db-migrate
- cd -
# stop GDK
echo "$(date) – Stopping GDK" | tee -a /workspace/startup.log
gdk stop
@@ -47,9 +49,11 @@ tasks:
if [ "$GITLAB_RUN_DB_MIGRATIONS" == true ]; then
make gitlab-db-migrate
fi
- cd ../gitlab
+ cd /workspace/gitlab-development-kit/gitlab
+ # Install Lefthook
+ bundle exec lefthook install
git checkout db/structure.sql
- cd ../gitlab-development-kit
+ cd /workspace/gitlab-development-kit
# Waiting for GitLab ...
gp await-port 3000
printf "Waiting for GitLab at $(gp url 3000) ..."