BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0fe0b044
Commit
0fe0b044
authored
Mar 03, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No need to set cache:key if no path was specified
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666/diffs#note_24607518
parent
cce1792c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
19 deletions
+9
-19
cache.rb
lib/gitlab/ci/config/entry/cache.rb
+0
-4
gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+6
-9
job_spec.rb
spec/lib/gitlab/ci/config/entry/job_spec.rb
+1
-2
jobs_spec.rb
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
+2
-4
No files found.
lib/gitlab/ci/config/entry/cache.rb
View file @
0fe0b044
...
@@ -25,10 +25,6 @@ module Gitlab
...
@@ -25,10 +25,6 @@ module Gitlab
helpers
:key
helpers
:key
def
self
.
default
{
key:
Entry
::
Key
.
default
}
end
def
value
def
value
super
.
merge
(
key:
key_value
)
super
.
merge
(
key:
key_value
)
end
end
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
0fe0b044
...
@@ -51,7 +51,7 @@ module Ci
...
@@ -51,7 +51,7 @@ module Ci
commands:
"pwd
\n
rspec"
,
commands:
"pwd
\n
rspec"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{
cache:
{
key:
'default'
}
},
options:
{},
allow_failure:
false
,
allow_failure:
false
,
when:
"on_success"
,
when:
"on_success"
,
environment:
nil
,
environment:
nil
,
...
@@ -468,8 +468,7 @@ module Ci
...
@@ -468,8 +468,7 @@ module Ci
tag_list:
[],
tag_list:
[],
options:
{
options:
{
image:
"ruby:2.1"
,
image:
"ruby:2.1"
,
services:
[
"mysql"
],
services:
[
"mysql"
]
cache:
{
key:
'default'
}
},
},
allow_failure:
false
,
allow_failure:
false
,
when:
"on_success"
,
when:
"on_success"
,
...
@@ -498,8 +497,7 @@ module Ci
...
@@ -498,8 +497,7 @@ module Ci
tag_list:
[],
tag_list:
[],
options:
{
options:
{
image:
"ruby:2.5"
,
image:
"ruby:2.5"
,
services:
[
"postgresql"
],
services:
[
"postgresql"
]
cache:
{
key:
'default'
}
},
},
allow_failure:
false
,
allow_failure:
false
,
when:
"on_success"
,
when:
"on_success"
,
...
@@ -740,7 +738,6 @@ module Ci
...
@@ -740,7 +738,6 @@ module Ci
options:
{
options:
{
image:
"ruby:2.1"
,
image:
"ruby:2.1"
,
services:
[
"mysql"
],
services:
[
"mysql"
],
cache:
{
key:
'default'
},
artifacts:
{
artifacts:
{
name:
"custom_name"
,
name:
"custom_name"
,
paths:
[
"logs/"
,
"binaries/"
],
paths:
[
"logs/"
,
"binaries/"
],
...
@@ -950,7 +947,7 @@ module Ci
...
@@ -950,7 +947,7 @@ module Ci
commands:
"test"
,
commands:
"test"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{
cache:
{
key:
'default'
}
},
options:
{},
when:
"on_success"
,
when:
"on_success"
,
allow_failure:
false
,
allow_failure:
false
,
environment:
nil
,
environment:
nil
,
...
@@ -996,7 +993,7 @@ module Ci
...
@@ -996,7 +993,7 @@ module Ci
commands:
"execute-script-for-job"
,
commands:
"execute-script-for-job"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{
cache:
{
key:
'default'
}
},
options:
{},
when:
"on_success"
,
when:
"on_success"
,
allow_failure:
false
,
allow_failure:
false
,
environment:
nil
,
environment:
nil
,
...
@@ -1009,7 +1006,7 @@ module Ci
...
@@ -1009,7 +1006,7 @@ module Ci
commands:
"execute-script-for-job"
,
commands:
"execute-script-for-job"
,
coverage_regex:
nil
,
coverage_regex:
nil
,
tag_list:
[],
tag_list:
[],
options:
{
cache:
{
key:
'default'
}
},
options:
{},
when:
"on_success"
,
when:
"on_success"
,
allow_failure:
false
,
allow_failure:
false
,
environment:
nil
,
environment:
nil
,
...
...
spec/lib/gitlab/ci/config/entry/job_spec.rb
View file @
0fe0b044
...
@@ -144,8 +144,7 @@ describe Gitlab::Ci::Config::Entry::Job do
...
@@ -144,8 +144,7 @@ describe Gitlab::Ci::Config::Entry::Job do
script:
%w[rspec]
,
script:
%w[rspec]
,
commands:
"ls
\n
pwd
\n
rspec"
,
commands:
"ls
\n
pwd
\n
rspec"
,
stage:
'test'
,
stage:
'test'
,
after_script:
%w[cleanup]
,
after_script:
%w[cleanup]
)
cache:
{
key:
'default'
})
end
end
end
end
end
end
...
...
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
View file @
0fe0b044
...
@@ -62,13 +62,11 @@ describe Gitlab::Ci::Config::Entry::Jobs do
...
@@ -62,13 +62,11 @@ describe Gitlab::Ci::Config::Entry::Jobs do
rspec:
{
name: :rspec
,
rspec:
{
name: :rspec
,
script:
%w[rspec]
,
script:
%w[rspec]
,
commands:
'rspec'
,
commands:
'rspec'
,
stage:
'test'
,
stage:
'test'
},
cache:
{
key:
'default'
}
},
spinach:
{
name: :spinach
,
spinach:
{
name: :spinach
,
script:
%w[spinach]
,
script:
%w[spinach]
,
commands:
'spinach'
,
commands:
'spinach'
,
stage:
'test'
,
stage:
'test'
})
cache:
{
key:
'default'
}
})
end
end
end
end
...
...
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