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
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
Hide 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
eslint.rake
lib/tasks/eslint.rake
+1
-1
karma.rake
lib/tasks/karma.rake
+1
-1
No files found.
.gitlab-ci.yml
View file @
8beb5998
...
...
@@ -107,7 +107,7 @@ setup-test-env:
<<
:
*dedicated-runner
stage
:
prepare
script
:
-
npm
install
-
yarn
install
-
bundle exec rake gitlab:assets:compile
-
bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts
:
...
...
@@ -326,7 +326,7 @@ lint:javascript:
stage
:
test
image
:
"
node:7.1"
script
:
-
npm --silent
run eslint
-
yarn
run eslint
lint:javascript:report
:
<<
:
*dedicated-runner
...
...
@@ -337,7 +337,7 @@ lint:javascript:report:
image
:
"
node:7.1"
script
:
-
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
:
name
:
eslint-report
expire_in
:
31d
...
...
lib/tasks/eslint.rake
View file @
8beb5998
unless
Rails
.
env
.
production?
desc
"GitLab | Run ESLint"
task
:eslint
do
system
(
"
npm
"
,
"run"
,
"eslint"
)
system
(
"
yarn
"
,
"run"
,
"eslint"
)
end
end
lib/tasks/karma.rake
View file @
8beb5998
...
...
@@ -11,7 +11,7 @@ unless Rails.env.production?
desc
'GitLab | Karma | Run JavaScript tests'
task
:tests
do
sh
"
npm
run karma"
do
|
ok
,
res
|
sh
"
yarn
run karma"
do
|
ok
,
res
|
abort
(
'rake karma:tests failed'
)
unless
ok
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