Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ac3d56e0
Commit
ac3d56e0
authored
Jan 24, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass BUNDLE_PATH to install to the same path for test
parent
4376be84
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
lib/tasks/gitlab/gitaly.rake
lib/tasks/gitlab/gitaly.rake
+5
-1
spec/tasks/gitlab/gitaly_rake_spec.rb
spec/tasks/gitlab/gitaly_rake_spec.rb
+5
-1
No files found.
lib/tasks/gitlab/gitaly.rake
View file @
ac3d56e0
...
@@ -21,7 +21,11 @@ namespace :gitlab do
...
@@ -21,7 +21,11 @@ namespace :gitlab do
_
,
status
=
Gitlab
::
Popen
.
popen
(
%w[which gmake]
)
_
,
status
=
Gitlab
::
Popen
.
popen
(
%w[which gmake]
)
command
<<
(
status
.
zero?
?
'gmake'
:
'make'
)
command
<<
(
status
.
zero?
?
'gmake'
:
'make'
)
command
<<
'BUNDLE_FLAGS=--no-deployment'
if
Rails
.
env
.
test?
if
Rails
.
env
.
test?
command
.
push
(
'BUNDLE_FLAGS=--no-deployment'
,
"BUNDLE_PATH=
#{
Bundler
.
bundle_path
}
"
)
end
Gitlab
::
SetupHelper
.
create_gitaly_configuration
(
args
.
dir
)
Gitlab
::
SetupHelper
.
create_gitaly_configuration
(
args
.
dir
)
Dir
.
chdir
(
args
.
dir
)
do
Dir
.
chdir
(
args
.
dir
)
do
...
...
spec/tasks/gitlab/gitaly_rake_spec.rb
View file @
ac3d56e0
...
@@ -76,7 +76,11 @@ describe 'gitlab:gitaly namespace rake task' do
...
@@ -76,7 +76,11 @@ describe 'gitlab:gitaly namespace rake task' do
end
end
context
'when Rails.env is test'
do
context
'when Rails.env is test'
do
let
(
:command
)
{
%w[make BUNDLE_FLAGS=--no-deployment]
}
let
(
:command
)
do
%W[make
BUNDLE_FLAGS=--no-deployment
BUNDLE_PATH=
#{
Bundler
.
bundle_path
}
]
end
before
do
before
do
allow
(
Rails
.
env
).
to
receive
(
:test?
).
and_return
(
true
)
allow
(
Rails
.
env
).
to
receive
(
:test?
).
and_return
(
true
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment