aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-05-06 12:43:33 +0200
committerGitHub <noreply@github.com>2018-05-06 12:43:33 +0200
commit73c5af594c7853e20c453749ed71b93f02595766 (patch)
treef0f2c4823055c1fb2026bd2bba420863f115e01d
parent3e35fc10e5f94ff7f49c416dfc4b77a0a15fbbfc (diff)
parent16d35cf77e0b650091a5a91a3c2d2c61631eb1cb (diff)
downloadShaarli-73c5af594c7853e20c453749ed71b93f02595766.tar.gz
Shaarli-73c5af594c7853e20c453749ed71b93f02595766.tar.zst
Shaarli-73c5af594c7853e20c453749ed71b93f02595766.zip
Merge pull request #1116 from ArthurHoaro/ci/eslint
Use Travis stages to run JS tests separately
-rw-r--r--.editorconfig2
-rw-r--r--.travis.yml41
2 files changed, 32 insertions, 11 deletions
diff --git a/.editorconfig b/.editorconfig
index 8783e4cb..f0d83ee3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
10indent_style = space 10indent_style = space
11indent_size = 4 11indent_size = 4
12 12
13[*.{htaccess,html,js,json,xml}] 13[*.{htaccess,html,js,json,xml,yml}]
14indent_size = 2 14indent_size = 2
15 15
16[*.php] 16[*.php]
diff --git a/.travis.yml b/.travis.yml
index 1b2bf97b..14b91cf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,44 @@
1sudo: false 1sudo: false
2dist: trusty 2dist: trusty
3language: php 3
4matrix:
5 include:
6 - language: php
7 php: 7.2
8 - language: php
9 php: 7.1
10 - language: php
11 php: 7.0
12 - language: php
13 php: 5.6
14 - language: node_js
15 node_js: 8
16 cache:
17 yarn: true
18 directories:
19 - $HOME/.cache/yarn
20
21 install:
22 - yarn install
23
24 before_script:
25 - PATH=${PATH//:\.\/node_modules\/\.bin/}
26
27 script:
28 - yarn run build # Just to be sure that the build isn't broken
29 - make eslint
30
4cache: 31cache:
5 yarn: true
6 directories: 32 directories:
7 - $HOME/.composer/cache 33 - $HOME/.composer/cache
8 - $HOME/.cache/yarn 34
9php:
10 - 7.2
11 - 7.1
12 - 7.0
13 - 5.6
14install: 35install:
15 - yarn install
16 - composer install --prefer-dist 36 - composer install --prefer-dist
37
17before_script: 38before_script:
18 - PATH=${PATH//:\.\/node_modules\/\.bin/} 39 - PATH=${PATH//:\.\/node_modules\/\.bin/}
40
19script: 41script:
20 - make clean 42 - make clean
21 - make check_permissions 43 - make check_permissions
22 - make eslint
23 - make all_tests 44 - make all_tests