From d69e6b7703043490e0f0f7aa458292fc2ed81fd2 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 23 Oct 2014 14:09:05 +0300 Subject: [PATCH] release 5.1 --- README.md | 2 +- VERSION | 2 +- doc/install/installation.md | 2 +- doc/update/5.0-to-5.1.md | 42 ++++++++++++++++++++++++++++++++++++ doc/update/patch_versions.md | 4 ++-- 5 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 doc/update/5.0-to-5.1.md diff --git a/README.md b/README.md index 1cb4cf499..5bc87f878 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Possible Cases: ![screen](https://gitlab.com/gitlab-org/gitlab-ci/raw/master/app/assets/images/arch.jpg) For more information see: -[Announcing GitLab CI 3.0](http://blog.gitlab.org/announcing-gitlab-ci-3.0/) +[Announcing GitLab CI 5.1](http://blog.gitlab.org/2014/10/22/gitlab-ci-5-dot-1-released/) and [Integrating GitLab CI With GitLab to Enable Distributed Builds](http://blog.gitlab.org/integrating-gitlab-ci-with-gitlab/) diff --git a/VERSION b/VERSION index 09b65f3fa..831446cbd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.0.rc1 +5.1.0 diff --git a/doc/install/installation.md b/doc/install/installation.md index a4149b9d9..e141101e6 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -104,7 +104,7 @@ You can use either MySQL or PostgreSQL. cd gitlab-ci - sudo -u gitlab_ci -H git checkout 5-0-stable + sudo -u gitlab_ci -H git checkout 5-1-stable ## 6. Setup application diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md new file mode 100644 index 000000000..9a37a87a8 --- /dev/null +++ b/doc/update/5.0-to-5.1.md @@ -0,0 +1,42 @@ +# Update from 5.0 to 5.1 + +__GitLab CI 5.1 requires GitLab 6.3 or higher and GitLab CI Runner v5__ + +### 1. stop CI server + + sudo service gitlab_ci stop + +### 2. Switch to your gitlab_ci user + +``` +sudo su gitlab_ci +cd /home/gitlab_ci/gitlab-ci +``` + +### 3. Get latest code + +``` +git fetch +git checkout 5-1-stable +``` + +#### Redis config + +If you have `config/resque.yml` file - please update it with recent `config/resque.yml.example` + +### 4. Install libs, migrations etc + +``` +# For MySQL users +bundle install --without postgres development test --deployment + +# For Postgres users +bundle install --without mysql development test --deployment + +# Run migrations +bundle exec rake db:migrate RAILS_ENV=production +``` + +### 5. Start web application + + sudo service gitlab_ci start \ No newline at end of file diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index 9075e584e..535b17ec4 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -1,6 +1,6 @@ # Universal update guide for patch versions. For example from 4.0.0 to 4.0.1, also see the [semantic versioning specification](http://semver.org/). -### 1. stop CI server +### 1. Stop CI server sudo service gitlab_ci stop @@ -11,7 +11,7 @@ sudo su gitlab_ci cd /home/gitlab_ci/gitlab-ci ``` -### 3. get latest code +### 3. Get latest code ``` git pull origin STABLE_BRANCH