Skip to content
Snippets Groups Projects
Commit aab30281 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre
Browse files

Switch to supporting the new ee/db/geo/structure.sql

Changelog: changed
parent 8a7c03c5
No related branches found
No related tags found
2 merge requests!55Intermediate build after shift of stable series,!54GitLab 14.4
...@@ -184,6 +184,6 @@ ...@@ -184,6 +184,6 @@
command "find #{install_dir}/embedded/lib/ruby/gems -name 'doc' -type d -print -exec rm -r {} +" command "find #{install_dir}/embedded/lib/ruby/gems -name 'doc' -type d -print -exec rm -r {} +"
# Because db/structure.sql is modified by `rake db:migrate` after installation, # Because db/structure.sql is modified by `rake db:migrate` after installation,
# keep a copy of schema.rb around in case we need it. (I am looking at you, # keep a copy of structure.sql around in case we need it. (I am looking at you,
# mysql-postgresql-converter.) # mysql-postgresql-converter.)
copy 'db/structure.sql', 'db/structure.sql.bundled' copy 'db/structure.sql', 'db/structure.sql.bundled'
...@@ -188,6 +188,6 @@ ...@@ -188,6 +188,6 @@
# mysql-postgresql-converter.) # mysql-postgresql-converter.)
copy 'db/structure.sql', 'db/structure.sql.bundled' copy 'db/structure.sql', 'db/structure.sql.bundled'
copy 'ee/db/geo/schema.rb', 'ee/db/geo/schema.rb.bundled' if EE copy 'ee/db/geo/structure.sql', 'ee/db/geo/structure.sql.bundled' if EE
command "mkdir -p #{install_dir}/embedded/service/gitlab-rails" command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
sync './', "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w( sync './', "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w(
......
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
action :nothing action :nothing
end end
# Make schema.rb writable for when we run `rake geo:db:migrate` # Make structure.sql writable for when we run `rake geo:db:migrate`
file '/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/schema.rb' do file '/opt/gitlab/embedded/service/gitlab-rails/ee/db/geo/structure.sql' do
owner gitlab_user owner gitlab_user
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment