Commit 619f4698 authored by Marin Jankovski's avatar Marin Jankovski Committed by Marin Jankovski

Merge branch 'ci-migrate-version-fix' into 'master'

Use GitlabCi::VERSION when checking migration

See merge request !1368
parent 56c75186
module Ci module Ci
module Migrate module Migrate
class Manager class Manager
VERSION = '8.0.0.pre'
def cleanup def cleanup
$progress.print "Deleting tmp directories ... " $progress.print "Deleting tmp directories ... "
...@@ -50,9 +48,9 @@ module Ci ...@@ -50,9 +48,9 @@ module Ci
ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0 ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0
# restoring mismatching backups can lead to unexpected problems # restoring mismatching backups can lead to unexpected problems
if settings[:gitlab_version] != VERSION if settings[:gitlab_version] != GitlabCi::VERSION
puts "GitLab CI version mismatch:".red puts "GitLab CI version mismatch:".red
puts " Your current GitLab CI version (#{VERSION}) differs from the GitLab CI (#{settings[:gitlab_version]}) version in the backup!".red puts " Your current GitLab CI version (#{GitlabCi::VERSION}) differs from the GitLab CI (#{settings[:gitlab_version]}) version in the backup!".red
exit 1 exit 1
end end
end end
......
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