Commit 4538e047 authored by Toon Claes's avatar Toon Claes

Merge branch 'sh-gdk-update-fix' into 'master'

Fix gdk update when gitlab branch is not on master

Closes #495

See merge request gitlab-org/gitlab-development-kit!669
parents 688e2b7a d52ae745
......@@ -250,8 +250,8 @@ self-update: unlock-dependency-installers
support/self-update-git-worktree
# Update gitlab, gitlab-shell, gitlab-workhorse, gitlab-pages and gitaly
update: ensure-postgres-running unlock-dependency-installers gitlab-shell-update gitlab-workhorse-update gitlab-pages-update gitaly-update gitlab-update
# Pull gitlab directory first since dependencies are linked from there.
update: ensure-postgres-running unlock-dependency-installers gitlab/.git/pull gitlab-shell-update gitlab-workhorse-update gitlab-pages-update gitaly-update gitlab-update
ensure-postgres-running:
@test -f ${postgres_data_dir}/postmaster.pid || \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment