Commit 70cc9c30 authored by Jacob Vosmaer's avatar Jacob Vosmaer 💬

Merge branch...

Merge branch '389-checkout-gitlab-shell-and-gitaly-according-the-gitlab-gitlab_shell_version-and-gitlab-gitaly_server_version-files-accordingly' into 'master'

Resolve "Checkout gitlab-shell and gitaly according the `gitlab/GITLAB_SHELL_VERSION` and `gitlab/GITALY_SERVER_VERSION` files accordingly"

Closes #389

See merge request !512
parents 599e3420 0ad04322
Pipeline #37961376 passed with stages
in 21 minutes and 35 seconds
......@@ -214,7 +214,9 @@ self-update: unlock-dependency-installers
@echo "--------------------------"
@echo ""
cd ${gitlab_development_root} && \
git stash && git checkout master && git fetch && \
git stash && \
git checkout master && \
git fetch && \
support/self-update-git-worktree
# Update gitlab, gitlab-shell, gitlab-workhorse and gitaly
......@@ -235,23 +237,27 @@ gitlab-shell-update: gitlab-shell/.git/pull gitlab-shell-setup
gitlab/.git/pull:
cd ${gitlab_development_root}/gitlab && \
git checkout -- Gemfile.lock db/schema.rb && \
git stash && git checkout master && \
git stash && \
git checkout master && \
git pull --ff-only
gitlab-shell/.git/pull:
cd ${gitlab_development_root}/gitlab-shell && \
git stash && git checkout master && \
git pull --ff-only
git stash && \
git fetch --all --tags --prune && \
git checkout v$(shell cat ${gitlab_development_root}/gitlab/GITLAB_SHELL_VERSION)
gitaly-update: gitaly/.git/pull gitaly-clean gitaly/bin/gitaly
.PHONY: gitaly/.git/pull
gitaly/.git/pull: ${gitaly_clone_dir}/.git ${gitaly_proto_clone_dir}/.git
cd ${gitaly_clone_dir} && \
git stash && git checkout master && \
git pull --ff-only
git stash && \
git fetch --all --tags --prune && \
git checkout v$(shell cat ${gitlab_development_root}/gitlab/GITALY_SERVER_VERSION)
cd ${gitaly_proto_clone_dir} && \
git stash && git checkout master && \
git stash && \
git checkout master && \
git pull --ff-only
gitaly-clean:
......@@ -420,9 +426,9 @@ ${gitlab_workhorse_clone_dir}/.git:
gitlab-workhorse/.git/pull:
cd ${gitlab_workhorse_clone_dir} && \
git stash &&\
git checkout master &&\
git pull --ff-only
git stash && \
git fetch --all --tags --prune && \
git checkout v$(shell cat ${gitlab_development_root}/gitlab/GITLAB_WORKHORSE_VERSION)
gitlab-pages-setup: gitlab-pages/bin/gitlab-pages
......
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