summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-09-14 10:37:00 +0000
committerHannes Rosenögger <123haynes@gmail.com>2015-09-14 10:37:00 +0000
commit661e3172291bd95ad0db8a79048e6a2efee9f029 (patch)
treeb613ddd6b33906e2a2716e1804813d1e8ef024d0
parent548d20e895e993777cf0f4c84f60c15fd5595fab (diff)
parent0ced0ace28a56787442a6db5915fc43e6665f3ea (diff)
downloadgitlab-ce-661e3172291bd95ad0db8a79048e6a2efee9f029.tar.gz
Merge branch 'latest_tag_patch_release' into 'master'
Add LATEST_TAG variable to automatically fetch the latest tag Add LATEST_TAG variable to automatically fetch the latest tag Replaces !1241 See merge request !1287
-rw-r--r--doc/update/patch_versions.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index 22b9be059d6..a66a863f6c4 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -1,7 +1,7 @@
# Universal update guide for patch versions
*Make sure you view this [upgrade guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/patch_versions.md) from the `master` branch for the most up to date instructions.*
-For example from 6.2.0 to 6.2.1, also see the [semantic versioning specification](http://semver.org/).
+For example from 7.14.0 to 7.14.3, also see the [semantic versioning specification](http://semver.org/).
### 0. Backup
@@ -23,17 +23,16 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
cd /home/git/gitlab
sudo -u git -H git fetch --all
sudo -u git -H git checkout -- Gemfile.lock db/schema.rb
-sudo -u git -H git checkout LATEST_TAG
+LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
+sudo -u git -H git checkout $LATEST_TAG -b $LATEST_TAG
```
-Replace LATEST_TAG with the latest GitLab tag you want to upgrade to, for example `v6.6.3`.
-
### 3. Update gitlab-shell to the corresponding version
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`
+sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION` -b v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`
```
### 4. Install libs, migrations, etc.