diff options
| -rw-r--r-- | doc/release/monthly.md | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 18 |
2 files changed, 21 insertions, 1 deletions
diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 446dbc6e6a9..99f2d4cafed 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -160,6 +160,10 @@ git push <remote> x-x-stable ### **3. Set VERSION to x.x.x and push** +Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed. + +Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed. + Change the VERSION file in `master` branch of the CE repository and commit. Cherry-pick into the `x-x-stable` branch of CE. Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE. diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 362693b0603..00af8d10291 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -606,6 +606,22 @@ namespace :gitlab do Gitlab::Shell.new.version end + def required_gitlab_shell_version + File.read(File.join(Rails.root, "GITLAB_SHELL_VERSION")).strip + end + + def gitlab_shell_major_version + required_gitlab_shell_version.split(".")[0].to_i + end + + def gitlab_shell_minor_version + required_gitlab_shell_version.split(".")[1].to_i + end + + def gitlab_shell_patch_version + required_gitlab_shell_version.split(".")[2].to_i + end + def has_gitlab_shell3? gitlab_shell_version.try(:start_with?, "v3.") end @@ -779,7 +795,7 @@ namespace :gitlab do end def check_gitlab_shell - required_version = Gitlab::VersionInfo.new(1, 9, 5) + required_version = Gitlab::VersionInfo.new(gitlab_shell_major_version, gitlab_shell_minor_version, gitlab_shell_patch_version) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) print "GitLab Shell version >= #{required_version} ? ... " |