Skip to content

Commit d8aaf2e

Browse files
refackBethGriggs
authored andcommitted
build,meta: tweak Travis config
* Add `lint-py-build` to get `lint-ci` to lint python * Add compile V8 job * Make compilation verbose * Test with `test-ci` PR-URL: #26969 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Signed-off-by: Beth Griggs <Bethany.Griggs@uk.ibm.com>
1 parent 35119d6 commit d8aaf2e

File tree

1 file changed

+36
-20
lines changed

1 file changed

+36
-20
lines changed

.travis.yml

+36-20
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,57 @@
1-
language: cpp
2-
cache: ccache
31
os: linux
42
dist: xenial
5-
stages:
6-
- check
7-
- test
8-
matrix:
3+
jobs:
94
include:
10-
- name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
11-
stage: check
5+
- stage: "Lint and Compile"
6+
name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
127
if: type = pull_request
138
language: node_js
149
node_js: "node"
1510
script:
1611
- if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
1712
bash -x tools/lint-pr-commit-message.sh ${TRAVIS_PULL_REQUEST};
1813
fi
14+
1915
- name: "Linter"
20-
stage: check
2116
language: node_js
2217
node_js: "node"
18+
install:
19+
- make lint-py-build || true
2320
script:
24-
- NODE=$(which node) make lint
25-
- name: "Prepare ccache"
26-
stage: check
21+
- NODE=$(which node) make lint-ci
22+
23+
- name: "Compile V8"
24+
language: cpp
25+
cache: ccache
2726
addons:
2827
apt:
2928
sources:
3029
- ubuntu-toolchain-r-test
3130
packages:
3231
- g++-6
3332
install:
34-
- export CC='ccache gcc-6' CXX='ccache g++-6' JOBS=2
35-
- ./configure
36-
- make -j2 V=
33+
- CC='ccache gcc-6' CXX='ccache g++-6' ./configure
34+
script:
35+
- CC='ccache gcc-6' CXX='ccache g++-6' make -j2 -C out V=1 v8
36+
37+
- name: "Compile Node.js"
38+
language: cpp
39+
cache: ccache
40+
addons:
41+
apt:
42+
sources:
43+
- ubuntu-toolchain-r-test
44+
packages:
45+
- g++-6
46+
install:
47+
- CC='ccache gcc-6' CXX='ccache g++-6' ./configure
3748
script:
38-
- true
39-
- name: "Test Suite"
40-
stage: test
49+
- CC='ccache gcc-6' CXX='ccache g++-6' make -j2 V=1
50+
51+
- stage: "Tests"
52+
name: "Test Suite"
53+
language: cpp
54+
cache: ccache
4155
addons:
4256
apt:
4357
sources:
@@ -47,6 +61,8 @@ matrix:
4761
install:
4862
- export CC='ccache gcc-6' CXX='ccache g++-6' JOBS=2
4963
- ./configure
50-
- make -j2 V=
64+
# We already have a compile log in the above job
65+
- make -j2 > /dev/null
66+
- make -j1 build-addons build-js-native-api-tests build-node-api-tests > /dev/null
5167
script:
52-
- CI_JS_SUITES='--flaky-tests=skip default' make -j1 test
68+
- JOBS=2 FLAKY_TESTS=skip make -s -j1 V= test-ci | grep -F -e "---" -e "..." -v

0 commit comments

Comments
 (0)