Download as
Browse Code »

Commit ad6eb0b66c4389483781ddea45d9add3eb888fd8

Authored by Jacob Vosmaer
1 parent bdd23b71
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Remove rsync in favor of built-in omnibus sync

Showing 4 changed files with 5 additions and 10 deletions   Show diff stats
config/software/gitlab-cookbooks.rb
  Diff comments   View file @ad6eb0b
... ... @@ -18,13 +18,11 @@
18 18  
19 19 name "gitlab-cookbooks"
20 20  
21   -dependency "rsync"
22   -
23 21 always_build true
24 22  
25 23 source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root)
26 24  
27 25 build do
28 26 command "mkdir -p #{install_dir}/embedded/cookbooks"
29   - command "#{install_dir}/embedded/bin/rsync --delete -a ./ #{install_dir}/embedded/cookbooks/"
  27 + sync ".", "#{install_dir}/embedded/cookbooks/"
30 28 end
... ...
config/software/gitlab-ctl.rb
  Diff comments   View file @ad6eb0b
... ... @@ -18,7 +18,6 @@
18 18  
19 19 name "gitlab-ctl"
20 20  
21   -dependency "rsync"
22 21 dependency "omnibus-ctl"
23 22  
24 23 source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root)
... ... @@ -65,5 +64,5 @@ done
65 64 command "chmod 755 #{install_dir}/bin/gitlab-ctl"
66 65  
67 66 # additional omnibus-ctl commands
68   - command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/"
  67 + sync ".", "#{install_dir}/embedded/service/omnibus-ctl/"
69 68 end
... ...
config/software/gitlab-rails.rb
  Diff comments   View file @ad6eb0b
... ... @@ -26,7 +26,6 @@ dependency "bundler"
26 26 dependency "libxml2"
27 27 dependency "libxslt"
28 28 dependency "curl"
29   -dependency "rsync"
30 29 dependency "libicu"
31 30 dependency "postgresql"
32 31 dependency "python-docutils"
... ... @@ -43,7 +42,7 @@ env = {
43 42  
44 43 build do
45 44 # GitLab assumes it can extract the Git revision of the currently version
46   - # from the Git repo the code lives in at boot. Because of our rsync later on,
  45 + # from the Git repo the code lives in at boot. Because of our sync later on,
47 46 # this assumption does not hold. The sed command below patches the GitLab
48 47 # source code to include the Git revision of the code included in the omnibus
49 48 # build.
... ... @@ -88,7 +87,7 @@ build do
88 87 command "cp db/schema.rb db/schema.rb.bundled"
89 88  
90 89 command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
91   - command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-rails/"
  90 + sync ".", "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w{.git .gitignore}
92 91  
93 92 # Create a wrapper for the rake tasks of the Rails app
94 93 erb :dest => "#{install_dir}/bin/gitlab-rake",
... ...
config/software/gitlab-shell.rb
  Diff comments   View file @ad6eb0b
... ... @@ -20,13 +20,12 @@ name "gitlab-shell"
20 20 default_version "91753e937e729c0fedc9a5dd7ae52b85436b4971" # 1.9.7
21 21  
22 22 dependency "ruby"
23   -dependency "rsync"
24 23  
25 24 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
26 25  
27 26 build do
28 27 command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"
29   - command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-shell/"
  28 + sync ".", "#{install_dir}/embedded/service/gitlab-shell/", exclude: %{.git .gitignore}
30 29 block do
31 30 env_shebang = "#!/usr/bin/env ruby"
32 31 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script|
... ...