Commit 310ac711 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis 🚀

Stash any uncommitted changes before pulling

parent 1337d923
......@@ -82,11 +82,15 @@ gitlab-runner-update: gitlab-runner/.git/pull
bundle install
gitlab/.git/pull:
cd ${gitlab_development_root}/gitlab && git checkout -- Gemfile.lock db/schema.rb && \
cd ${gitlab_development_root}/gitlab && \
git checkout -- Gemfile.lock db/schema.rb && \
git stash && git checkout master && \
git pull --ff-only
gitlab-shell/.git/pull:
cd ${gitlab_development_root}/gitlab-shell && git pull --ff-only
cd ${gitlab_development_root}/gitlab-shell && \
git stash && git checkout master && \
git pull --ff-only
gitlab-runner/.git/pull:
cd ${gitlab_development_root}/gitlab-runner && git pull --ff-only
......
......@@ -345,9 +345,14 @@ postgres is runnning (needed for db migration) and then run:
make update
```
This will update both `gitlab`, `gitlab-ci` and `gitlab-shell` and run any possible migrations.
You can also update them separately by running `make gitlab-update` `make gitlab-ci-update` and
`make gitlab-shell-update` respectively.
This will update both `gitlab` and `gitlab-shell` and run any possible
migrations. You can also update them separately by running `make gitlab-update`
and `make gitlab-shell-update` respectively.
If there are changes in the aformentioned local repositories or/and a different
branch than master is checked out, the `make update` commands will stash any
uncommitted changes and change to master branch prior to updating the remote
repositories.
## Update configuration files created by gitlab-development-kit
......
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