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
2562dc81
Commit
2562dc81
authored
Jul 06, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run eslint as-if-foss upon any frontend changes in EE
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
db775720
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
13 deletions
+26
-13
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+17
-13
.gitlab/ci/rules.gitlab-ci.yml
.gitlab/ci/rules.gitlab-ci.yml
+9
-0
No files found.
.gitlab/ci/frontend.gitlab-ci.yml
View file @
2562dc81
...
@@ -2,16 +2,18 @@
...
@@ -2,16 +2,18 @@
extends
:
extends
:
-
.default-retry
-
.default-retry
-
.default-before_script
-
.default-before_script
-
.assets-compile-cache
variables
:
variables
:
SETUP_DB
:
"
false"
SETUP_DB
:
"
false"
# we override the max_old_space_size to prevent OOM errors
# we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS
:
--max_old_space_size=3584
NODE_OPTIONS
:
--max_old_space_size=3584
WEBPACK_VENDOR_DLL
:
"
true"
.compile-assets-base
:
.compile-assets-base
:
extends
:
.frontend-base
extends
:
-
.frontend-base
-
.assets-compile-cache
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.27-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-git-2.27-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34
variables
:
WEBPACK_VENDOR_DLL
:
"
true"
stage
:
prepare
stage
:
prepare
script
:
script
:
-
node --version
-
node --version
...
@@ -99,6 +101,7 @@ update-yarn-cache:
...
@@ -99,6 +101,7 @@ update-yarn-cache:
needs
:
[
"
setup-test-env"
,
"
compile-test-assets"
]
needs
:
[
"
setup-test-env"
,
"
compile-test-assets"
]
variables
:
variables
:
SETUP_DB
:
"
true"
SETUP_DB
:
"
true"
WEBPACK_VENDOR_DLL
:
"
true"
script
:
script
:
-
run_timed_command "scripts/gitaly-test-build"
-
run_timed_command "scripts/gitaly-test-build"
-
run_timed_command "scripts/gitaly-test-spawn"
-
run_timed_command "scripts/gitaly-test-spawn"
...
@@ -123,22 +126,25 @@ frontend-fixtures-as-if-foss:
...
@@ -123,22 +126,25 @@ frontend-fixtures-as-if-foss:
.frontend-test-base
:
.frontend-test-base
:
extends
:
extends
:
-
.
default-retry
-
.
frontend-base
-
.yarn-cache
-
.yarn-cache
variables
:
variables
:
USE_BUNDLE_INSTALL
:
"
false"
USE_BUNDLE_INSTALL
:
"
false"
SETUP_DB
:
"
false"
stage
:
test
stage
:
test
before_script
:
-
source scripts/utils.sh
eslint-as-if-foss
:
extends
:
-
.frontend-test-base
-
.frontend:rules:eslint-as-if-foss
-
.as-if-foss
needs
:
[]
script
:
-
run_timed_command "retry yarn install --frozen-lockfile"
-
yarn run eslint
.karma-base
:
.karma-base
:
extends
:
.frontend-test-base
extends
:
.frontend-test-base
variables
:
# we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS
:
--max_old_space_size=3584
script
:
script
:
-
source scripts/utils.sh
-
export BABEL_ENV=coverage CHROME_LOG_FILE=chrome_debug.log
-
export BABEL_ENV=coverage CHROME_LOG_FILE=chrome_debug.log
-
run_timed_command "retry yarn install --frozen-lockfile"
-
run_timed_command "retry yarn install --frozen-lockfile"
-
run_timed_command "yarn karma"
-
run_timed_command "yarn karma"
...
@@ -171,7 +177,6 @@ karma-as-if-foss:
...
@@ -171,7 +177,6 @@ karma-as-if-foss:
.jest-base
:
.jest-base
:
extends
:
.frontend-test-base
extends
:
.frontend-test-base
script
:
script
:
-
source scripts/utils.sh
-
run_timed_command "retry yarn install --frozen-lockfile"
-
run_timed_command "retry yarn install --frozen-lockfile"
-
run_timed_command "yarn jest --ci --coverage --testSequencer ./scripts/frontend/parallel_ci_sequencer.js"
-
run_timed_command "yarn jest --ci --coverage --testSequencer ./scripts/frontend/parallel_ci_sequencer.js"
...
@@ -197,7 +202,6 @@ jest-integration:
...
@@ -197,7 +202,6 @@ jest-integration:
-
.frontend-test-base
-
.frontend-test-base
-
.frontend:rules:default-frontend-jobs
-
.frontend:rules:default-frontend-jobs
script
:
script
:
-
source scripts/utils.sh
-
run_timed_command "retry yarn install --frozen-lockfile"
-
run_timed_command "retry yarn install --frozen-lockfile"
-
run_timed_command "yarn jest:integration --ci"
-
run_timed_command "yarn jest:integration --ci"
needs
:
[
"
frontend-fixtures"
]
needs
:
[
"
frontend-fixtures"
]
...
...
.gitlab/ci/rules.gitlab-ci.yml
View file @
2562dc81
...
@@ -343,6 +343,15 @@
...
@@ -343,6 +343,15 @@
-
<<
:
*if-merge-request
-
<<
:
*if-merge-request
changes
:
*ci-patterns
changes
:
*ci-patterns
.frontend:rules:eslint-as-if-foss:
rules
:
-
<<
:
*if-not-ee
when
:
never
-
<<
:
*if-merge-request-title-as-if-foss
when
:
never
-
<<
:
*if-merge-request
changes
:
*frontend-patterns
.frontend:rules:ee-mr-and-master-only:
.frontend:rules:ee-mr-and-master-only:
rules
:
rules
:
-
<<
:
*if-not-ee
-
<<
:
*if-not-ee
...
...
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