Update check task and add to monthly release doc lines about gitlab_shell_version file.

Marin Jankovski
1 parent 6384344f
Showing 2 changed files with 21 additions and 1 deletions Show diff stats
doc/release/monthly.md
lib/tasks/gitlab/check.rake
@@ -160,6 +160,10 @@ git push &lt;remote&gt; 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.
@@ -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} ? ... "
...	...	@@ -160,6 +160,10 @@ git push <remote> x-x-stable
160	160
161	161	### 3. Set VERSION to x.x.x and push
162	162
	163	+Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed.
	164	+
	165	+Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed.
	166	+
163	167	Change the VERSION file in `master` branch of the CE repository and commit. Cherry-pick into the `x-x-stable` branch of CE.
164	168
165	169	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	606	Gitlab::Shell.new.version
607	607	end
608	608
	609	+ def required_gitlab_shell_version
	610	+ File.read(File.join(Rails.root, "GITLAB_SHELL_VERSION")).strip
	611	+ end
	612	+
	613	+ def gitlab_shell_major_version
	614	+ required_gitlab_shell_version.split(".")[0].to_i
	615	+ end
	616	+
	617	+ def gitlab_shell_minor_version
	618	+ required_gitlab_shell_version.split(".")[1].to_i
	619	+ end
	620	+
	621	+ def gitlab_shell_patch_version
	622	+ required_gitlab_shell_version.split(".")[2].to_i
	623	+ end
	624	+
609	625	def has_gitlab_shell3?
610	626	gitlab_shell_version.try(:start_with?, "v3.")
611	627	end
...	...	@@ -779,7 +795,7 @@ namespace :gitlab do
779	795	end
780	796
781	797	def check_gitlab_shell
782		- required_version = Gitlab::VersionInfo.new(1, 9, 5)
	798	+ required_version = Gitlab::VersionInfo.new(gitlab_shell_major_version, gitlab_shell_minor_version, gitlab_shell_patch_version)
783	799	current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
784	800
785	801	print "GitLab Shell version >= #{required_version} ? ... "
...	...