Commit d2052925 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'gitlab_shell_version_file' into 'master'

Gitlab shell version file
parents 03587abc dca6c490
...@@ -160,6 +160,10 @@ git push <remote> x-x-stable ...@@ -160,6 +160,10 @@ git push <remote> x-x-stable
### **3. Set VERSION to x.x.x and push** ### **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 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. Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE.
......
...@@ -606,6 +606,22 @@ namespace :gitlab do ...@@ -606,6 +606,22 @@ namespace :gitlab do
Gitlab::Shell.new.version Gitlab::Shell.new.version
end 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? def has_gitlab_shell3?
gitlab_shell_version.try(:start_with?, "v3.") gitlab_shell_version.try(:start_with?, "v3.")
end end
...@@ -779,7 +795,7 @@ namespace :gitlab do ...@@ -779,7 +795,7 @@ namespace :gitlab do
end end
def check_gitlab_shell 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) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... " print "GitLab Shell version >= #{required_version} ? ... "
......
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