Commit 20251668 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'remove-bin-compile-reference' into 'master'

gitlab-shell: Replace `bin/compile` with `make build`

See merge request gitlab-org/gitlab!18820
parents 80357501 0f757bec
......@@ -43,7 +43,7 @@ namespace :gitlab do
[
%w(bin/install) + repository_storage_paths_args,
%w(bin/compile)
%w(make build)
].each do |cmd|
unless Kernel.system(*cmd)
raise "command failed: #{cmd.join(' ')}"
......
......@@ -17,7 +17,7 @@ describe 'gitlab:shell rake tasks' do
expect_any_instance_of(Gitlab::TaskHelpers).to receive(:checkout_or_clone_version)
allow(Kernel).to receive(:system).with('bin/install', *storages).and_return(true)
allow(Kernel).to receive(:system).with('bin/compile').and_return(true)
allow(Kernel).to receive(:system).with('make', 'build').and_return(true)
run_rake_task('gitlab:shell:install')
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