Skip to content

Commit b8cc8db

Browse files
kamilogorekkamilogorek
committed
test: Rework travis jobs
1 parent 59924de commit b8cc8db

File tree

15 files changed

+146
-132
lines changed

15 files changed

+146
-132
lines changed

‎.travis.yml

Lines changed: 52 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ branches:
55
install: true
66
sudo: required
77

8-
node_js:
9-
- "4"
10-
- "5"
11-
- "6"
12-
- "7"
13-
- "8"
14-
- "9"
15-
- "10"
16-
178
language: node_js
189
dist: trusty
1910

@@ -22,17 +13,62 @@ cache:
2213
directories:
2314
- node_modules
2415

25-
script: .travis/script.sh
26-
2716
matrix:
2817
include:
29-
- node_js: "8"
18+
- name: "@sentry/packages - lint"
19+
node_js: "8"
3020
script: .travis/lint.sh
31-
- node_js: "8"
21+
- name: "@sentry/packages - build and test [node v6]"
22+
node_js: "6"
23+
script: .travis/test.sh
24+
- name: "@sentry/packages - build and test [node v7]"
25+
node_js: "7"
26+
script: .travis/test.sh
27+
- name: "@sentry/packages - build and test [node v8]"
28+
node_js: "8"
29+
script: .travis/test.sh
30+
- name: "@sentry/packages - build and test [node v9]"
31+
node_js: "9"
32+
script: .travis/test.sh
33+
- name: "@sentry/packages - build and test [node v10]"
34+
node_js: "10"
35+
script: .travis/test.sh
36+
- name: "@sentry/browser - integration tests"
37+
node_js: "8"
3238
addons:
3339
chrome: stable
3440
firefox: latest
3541
sauce_connect: true
36-
script: .travis/script.sh
37-
exclude:
38-
- node_js: "8"
42+
script: .travis/integration.sh
43+
- name: "raven-js - unit and integration tests"
44+
node_js: "8"
45+
addons:
46+
chrome: stable
47+
firefox: latest
48+
script: .travis/raven-js.sh
49+
- name: "raven-js - saucelabs tests"
50+
node_js: "8"
51+
addons:
52+
sauce_connect: true
53+
script: .travis/raven-js-saucelabs.sh
54+
- name: "raven-node [node v4]"
55+
node_js: "4"
56+
script: .travis/raven-node.sh
57+
- name: "raven-node [node v5]"
58+
node_js: "5"
59+
script: .travis/raven-node.sh
60+
- name: "raven-node [node v6]"
61+
node_js: "6"
62+
script: .travis/raven-node.sh
63+
- name: "raven-node [node v7]"
64+
node_js: "7"
65+
script: .travis/raven-node.sh
66+
- name: "raven-node [node v8]"
67+
node_js: "8"
68+
script: .travis/raven-node.sh
69+
- name: "raven-node [node v9]"
70+
node_js: "9"
71+
script: .travis/raven-node.sh
72+
- name: "raven-node [node v10]"
73+
node_js: "10"
74+
script: .travis/raven-node.sh

‎.travis/before_script.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.travis/detect-raven.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Is it master branch?
5+
if [[ $TRAVIS_BRANCH == "master" ]]; then
6+
IS_MASTER_BRANCH=true
7+
fi
8+
9+
# Does any of the commits in a PR contain "[force ci]" string?
10+
if [[ -n $(grep '\[force ci\]' <<< "$(git log --format=%B --no-merges -n 1)") ]]; then
11+
FORCE_COMMIT=true
12+
fi
13+
14+
# Does any changed file lives in raven-js/raven-node directory?
15+
if [[ -n $(grep "$RAVEN" <<< "$(git --no-pager diff --name-only FETCH_HEAD "$(git merge-base FETCH_HEAD master)")") ]]; then
16+
HAS_CHANGES=true
17+
fi
18+
19+
# Is this not a Travis PR?
20+
if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then
21+
NOT_TRAVIS_PR=true
22+
fi
23+
24+
# If any of the above is true, run tests
25+
if [[ ($IS_MASTER_BRANCH == "true" || $FORCE_COMMIT == "true" || $HAS_CHANGES == "true" ||$NOT_TRAVIS_PR == "true") ]]; then
26+
SHOULD_RUN=true
27+
fi
28+

‎.travis/integration.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
set -e
3+
4+
yarn
5+
# We have to build other packages first, as we use absolute packages import in TypeScript
6+
yarn build
7+
cd packages/browser
8+
yarn test:integration

‎.travis/lint.sh

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
source .travis/before_script.sh
5-
6-
# Run @sentry/*
7-
yarn && yarn build && yarn lint
8-
9-
# Run raven-node
10-
if [[ ("$RAVEN_NODE_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then
11-
cd packages/raven-node
12-
npm install
13-
npm run lint
14-
cd ../..
15-
fi
16-
17-
# Run raven-js
18-
if [[ ("$RAVEN_JS_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then
19-
cd packages/raven-js
20-
npm install
21-
npm run lint
22-
cd ../..
23-
fi
4+
yarn
5+
# We have to build it first, so that TypeScript Types are recognized correctly
6+
yarn build
7+
yarn lint

‎.travis/raven-js-saucelabs.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -e
3+
4+
RAVEN="raven-js"
5+
source .travis/detect-raven.sh
6+
7+
if [[ $SHOULD_RUN == "true" ]]; then
8+
cd packages/raven-js
9+
npm install
10+
npm run test:ci
11+
fi

‎.travis/raven-js.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -e
3+
4+
RAVEN="raven-js"
5+
source .travis/detect-raven.sh
6+
7+
if [[ $SHOULD_RUN == "true" ]]; then
8+
cd packages/raven-js
9+
npm install
10+
npm run lint
11+
npm run test
12+
fi

‎.travis/raven-node.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -e
3+
4+
RAVEN="raven-node"
5+
source .travis/detect-raven.sh
6+
7+
if [[ $SHOULD_RUN == "true" ]]; then
8+
cd packages/raven-node
9+
npm install
10+
npm run lint
11+
npm run test
12+
fi

‎.travis/script.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.travis/test.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
set -e
3+
4+
yarn
5+
yarn build
6+
yarn test
7+
yarn codecov

‎packages/browser/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
"fix": "run-s fix:tslint fix:prettier",
6161
"fix:prettier": "prettier --write '{src,test}/**/*.ts'",
6262
"fix:tslint": "tslint --fix -t stylish -p .",
63-
"test": "run-s test:unit test:integration",
64-
"test:unit": "karma start karma/karma.unit.config.js",
63+
"test": "karma start karma/karma.unit.config.js",
6564
"test:watch": "karma start karma/karma.unit.config.js --auto-watch --no-single-run",
6665
"test:integration": "karma start karma/karma.integration.config.js",
6766
"test:integration:watch": "karma start karma/karma.integration.config.js --auto-watch --no-single-run",

‎packages/hub/src/scope.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,8 @@ export class Scope {
192192
if (this.fingerprint && event.fingerprint === undefined) {
193193
event.fingerprint = this.fingerprint;
194194
}
195-
// We only want to set breadcrumbs in the event if there are none
196-
const hasNoBreadcrumbs =
197-
!event.breadcrumbs ||
198-
event.breadcrumbs.length === 0 ||
199-
(event.breadcrumbs.values && event.breadcrumbs.values.length === 0);
195+
196+
const hasNoBreadcrumbs = !event.breadcrumbs || event.breadcrumbs.length === 0;
200197
if (hasNoBreadcrumbs && this.breadcrumbs.length > 0) {
201198
event.breadcrumbs =
202199
maxBreadcrumbs !== undefined && maxBreadcrumbs >= 0

‎packages/hub/test/lib/hub.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ describe('Hub', () => {
285285
expect(callCounter.mock.calls[1][0]).toBe(2);
286286
expect(callCounter.mock.calls[2][0]).toBe(3);
287287
expect(callCounter.mock.calls[3][0]).toBe(4);
288-
expect(final!.dist).toEqual('1');
288+
expect(final.dist).toEqual('1');
289289
});
290290

291291
test('pushScope inherit processors', async () => {
@@ -305,7 +305,7 @@ describe('Hub', () => {
305305
const pushedScope = hub.getStackTop().scope;
306306
if (pushedScope) {
307307
const final = await pushedScope.applyToEvent(event);
308-
expect(final!.dist).toEqual('1');
308+
expect(final.dist).toEqual('1');
309309
}
310310
});
311311

‎packages/raven-js/package.json

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
{
22
"name": "raven-js",
33
"description": "JavaScript client for Sentry",
4-
"keywords": [
5-
"debugging",
6-
"errors",
7-
"exceptions",
8-
"logging",
9-
"raven",
10-
"sentry"
11-
],
4+
"keywords": ["debugging", "errors", "exceptions", "logging", "raven", "sentry"],
125
"version": "3.26.4",
136
"repository": "git://github.com/getsentry/raven-js.git",
147
"license": "BSD-2-Clause",
@@ -18,16 +11,19 @@
1811
"deploy": "npm run test && ./scripts/deploy.js",
1912
"lint": "eslint .",
2013
"publish": "grunt publish",
21-
"test": "npm run lint && grunt build.test && npm run test:unit && npm run test:loader && npm run test:integration && npm run test:typescript",
14+
"test":
15+
"grunt build.test && npm run test:unit && npm run test:loader && npm run test:integration && npm run test:typescript",
2216
"test:unit": "karma start karma/karma.unit.config.js",
2317
"test:integration": "karma start karma/karma.integration.config.js",
2418
"test:integration-sauce": "karma start karma/karma.integration-sauce.config.js",
2519
"test:loader": "karma start karma/karma.loader.config.js",
2620
"test:loader-sauce": "karma start karma/karma.loader-sauce.config.js",
2721
"test:typescript": "tsc -p tsconfig.json",
28-
"test:ci": "npm run lint && grunt test:ci && npm run test:loader-sauce && npm run test:integration-sauce",
22+
"test:ci":
23+
"grunt test:ci && npm run test:loader-sauce && npm run test:integration-sauce",
2924
"test:size": "grunt dist && bundlesize && git checkout -- dist/",
30-
"loader": "cat src/loader.js | sed '/build_marker/{N;d;}' | npx google-closure-compiler-js | perl -e \"print ';'; print <STDIN>;\""
25+
"loader":
26+
"cat src/loader.js | sed '/build_marker/{N;d;}' | npx google-closure-compiler-js | perl -e \"print ';'; print <STDIN>;\""
3127
},
3228
"devDependencies": {
3329
"bluebird": "^3.4.1",

‎packages/raven-node/app.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)