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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
8beb5998
Commit
8beb5998
authored
Feb 07, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace npm run calls with yarn
parent
469bc859
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
.gitlab-ci.yml
.gitlab-ci.yml
+3
-3
lib/tasks/eslint.rake
lib/tasks/eslint.rake
+1
-1
lib/tasks/karma.rake
lib/tasks/karma.rake
+1
-1
No files found.
.gitlab-ci.yml
View file @
8beb5998
...
@@ -107,7 +107,7 @@ setup-test-env:
...
@@ -107,7 +107,7 @@ setup-test-env:
<<
:
*dedicated-runner
<<
:
*dedicated-runner
stage
:
prepare
stage
:
prepare
script
:
script
:
-
npm
install
-
yarn
install
-
bundle exec rake gitlab:assets:compile
-
bundle exec rake gitlab:assets:compile
-
bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
-
bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts
:
artifacts
:
...
@@ -326,7 +326,7 @@ lint:javascript:
...
@@ -326,7 +326,7 @@ lint:javascript:
stage
:
test
stage
:
test
image
:
"
node:7.1"
image
:
"
node:7.1"
script
:
script
:
-
npm --silent
run eslint
-
yarn
run eslint
lint:javascript:report:
lint:javascript:report:
<<
:
*dedicated-runner
<<
:
*dedicated-runner
...
@@ -337,7 +337,7 @@ lint:javascript:report:
...
@@ -337,7 +337,7 @@ lint:javascript:report:
image
:
"
node:7.1"
image
:
"
node:7.1"
script
:
script
:
-
find app/ spec/ -name '*.js' -or -name '*.js.es6' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \;
# run report over all files
-
find app/ spec/ -name '*.js' -or -name '*.js.es6' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \;
# run report over all files
-
npm --silent
run eslint-report ||
true
# ignore exit code
-
yarn
run eslint-report ||
true
# ignore exit code
artifacts
:
artifacts
:
name
:
eslint-report
name
:
eslint-report
expire_in
:
31d
expire_in
:
31d
...
...
lib/tasks/eslint.rake
View file @
8beb5998
unless
Rails
.
env
.
production?
unless
Rails
.
env
.
production?
desc
"GitLab | Run ESLint"
desc
"GitLab | Run ESLint"
task
:eslint
do
task
:eslint
do
system
(
"
npm
"
,
"run"
,
"eslint"
)
system
(
"
yarn
"
,
"run"
,
"eslint"
)
end
end
end
end
lib/tasks/karma.rake
View file @
8beb5998
...
@@ -11,7 +11,7 @@ unless Rails.env.production?
...
@@ -11,7 +11,7 @@ unless Rails.env.production?
desc
'GitLab | Karma | Run JavaScript tests'
desc
'GitLab | Karma | Run JavaScript tests'
task
:tests
do
task
:tests
do
sh
"
npm
run karma"
do
|
ok
,
res
|
sh
"
yarn
run karma"
do
|
ok
,
res
|
abort
(
'rake karma:tests failed'
)
unless
ok
abort
(
'rake karma:tests failed'
)
unless
ok
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