Skip to content

Commit c7d1890

Browse files
devversionAndrewKushnir
authored andcommitted
build: remove travisci leftovers (angular#27979)
PR Close angular#27979
1 parent c7346bf commit c7d1890

File tree

19 files changed

+27
-129
lines changed

19 files changed

+27
-129
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
191191
Must be one of the following:
192192

193193
* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
194-
* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
194+
* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs)
195195
* **docs**: Documentation only changes
196196
* **feat**: A new feature
197197
* **fix**: A bug fix

aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.js

-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ module.exports = function(config) {
2323
clearContext: false // leave Jasmine Spec Runner output visible in browser
2424
},
2525

26-
customLaunchers: {
27-
// From the CLI. Not used here but interesting
28-
// chrome setup for travis CI using chromium
29-
Chrome_travis_ci: {
30-
base: 'Chrome',
31-
flags: ['--no-sandbox']
32-
}
33-
},
34-
3526
files: [
3627
// System.js for module loading
3728
'node_modules/systemjs/dist/system.src.js',

aio/content/examples/upgrade-phonecat-3-final/karma.conf.js

-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ module.exports = function(config) {
2323
clearContext: false // leave Jasmine Spec Runner output visible in browser
2424
},
2525

26-
customLaunchers: {
27-
// From the CLI. Not used here but interesting
28-
// chrome setup for travis CI using chromium
29-
Chrome_travis_ci: {
30-
base: 'Chrome',
31-
flags: ['--no-sandbox']
32-
}
33-
},
34-
3526
files: [
3627
// System.js for module loading
3728
'node_modules/systemjs/dist/system.src.js',

aio/content/guide/testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Continuous integration (CI) servers let you set up your project repository so th
9999
There are paid CI services like Circle CI and Travis CI, and you can also host your own for free using Jenkins and others.
100100
Although Circle CI and Travis CI are paid services, they are provided free for open source projects.
101101
You can create a public project on GitHub and add these services without paying.
102-
Contributions to the Angular repo are automatically run through a whole suite of Circle CI and Travis CI tests.
102+
Contributions to the Angular repo are automatically run through a whole suite of Circle CI tests.
103103

104104
This article explains how to configure your project to run Circle CI and Travis CI, and also update your test configuration to be able to run tests in the Chrome browser in either environment.
105105

aio/scripts/test-pwa-score.js

-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ const LIGHTHOUSE_FLAGS = {logLevel: 'info'};
2323
const SKIPPED_HTTPS_AUDITS = ['redirects-http'];
2424
const VIEWER_URL = 'https://googlechrome.github.io/lighthouse/viewer/';
2525

26-
27-
// Specify the path and flags for Chrome on Travis.
28-
if (process.env.TRAVIS) {
29-
process.env.LIGHTHOUSE_CHROMIUM_PATH = process.env.CHROME_BIN;
30-
CHROME_LAUNCH_OPTS.chromeFlags = ['--no-sandbox'];
31-
}
32-
3326
// Be less verbose on CI.
3427
if (process.env.CI) {
3528
LIGHTHOUSE_FLAGS.logLevel = 'error';

aio/src/karma.conf.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@ module.exports = function (config) {
2525
colors: true,
2626
logLevel: config.LOG_INFO,
2727
autoWatch: true,
28-
browsers: ['CustomChrome'],
28+
browsers: ['Chrome'],
2929
browserNoActivityTimeout: 60000,
3030
singleRun: false,
31-
customLaunchers: {
32-
CustomChrome: {
33-
base: 'Chrome',
34-
flags: process.env.TRAVIS && ['--no-sandbox']
35-
}
36-
}
3731
});
3832
};

aio/tests/deployment/e2e/protractor.conf.js

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ exports.config = {
1010
suite: 'full',
1111
capabilities: {
1212
browserName: 'chrome',
13-
// For Travis
14-
chromeOptions: {
15-
binary: process.env.CHROME_BIN,
16-
args: ['--no-sandbox']
17-
}
1813
},
1914
directConnect: true,
2015
framework: 'jasmine',

aio/tests/e2e/protractor.conf.js

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ exports.config = {
1010
],
1111
capabilities: {
1212
browserName: 'chrome',
13-
// For Travis
14-
chromeOptions: {
15-
binary: process.env.CHROME_BIN,
16-
args: ['--no-sandbox']
17-
}
1813
},
1914
directConnect: true,
2015
baseUrl: 'http://localhost:4200/',

aio/tools/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ See the [README.md](cli-patches/README.md) for more details.
2121
Many of the documentation pages contain snippets of code examples. We extract these snippets from real
2222
working example applications, which are stored in subfolders of the `/aio/content/examples` folder. Each
2323
example can be built and run independently. Each example also provides e2e specs, which are run as part
24-
of our Travis build tasks, to verify that the examples continue to work as expected, as changes are made
24+
of our CI build tasks, to verify that the examples continue to work as expected, as changes are made
2525
to the core Angular libraries.
2626

2727
In order to build, run and test these examples independently we need to install dependencies into their

aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ exports.config = {
1010
],
1111
capabilities: {
1212
'browserName': 'chrome',
13-
// For Travis CI only
14-
chromeOptions: {
15-
binary: process.env.CHROME_BIN,
16-
args: ['--no-sandbox']
17-
}
1813
},
1914
directConnect: true,
2015
baseUrl: 'http://localhost:4200/',

aio/tools/examples/shared/protractor.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ exports.config = {
2121
// Capabilities to be passed to the webdriver instance.
2222
capabilities: {
2323
'browserName': 'chrome',
24-
// For Travis
25-
chromeOptions: {
26-
binary: process.env.CHROME_BIN,
27-
args: ['--no-sandbox']
28-
}
2924
},
3025

3126
// Framework to use. Jasmine is recommended.

browser-providers.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// and BrowserStack (BS).
1111
// If the target is set to null, then the browser is not run anywhere during CI.
1212
// If a category becomes empty (e.g. BS and required), then the corresponding job must be commented
13-
// out in Travis configuration.
13+
// out in the CI configuration.
1414
var CIconfiguration = {
1515
'Chrome': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
1616
'Firefox': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},

docs/DEVELOPER.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ http://github.com/angular/core-builds.
136136

137137
You may find that your un-merged change needs some validation from external participants.
138138
Rather than requiring them to pull your Pull Request and build Angular locally, you can
139-
publish the `*-builds` snapshots just like our Travis build does.
139+
publish the `*-builds` snapshots just like our CircleCI build does.
140140

141141
First time, you need to create the github repositories:
142142

143143
``` shell
144144
$ export TOKEN=[get one from https://github.com/settings/tokens]
145-
$ CREATE_REPOS=1 TRAVIS= ./scripts/ci/publish-build-artifacts.sh [github username]
145+
$ CREATE_REPOS=1 ./scripts/ci/publish-build-artifacts.sh [github username]
146146
```
147147

148148
For subsequent snapshots, just run

modules/benchmarks/src/largetable/render3/index.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,4 @@ export function main() {
2727
}
2828
}
2929

30-
const isBazel = location.pathname.indexOf('/all/') !== 0;
31-
// isBazel needed while 'scripts/ci/test-e2e.sh test.e2e.protractor-e2e' is run
32-
// on Travis
33-
// TODO: port remaining protractor e2e tests to bazel protractor_web_test_suite rule
34-
if (isBazel) {
35-
main();
36-
}
30+
main();

protractor-e2e.conf.js

+6-18
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,6 @@
1010
// as this could exit node if the help script should be printed.
1111
require('./dist/all/e2e_util/e2e_util').readCommandLine();
1212

13-
var BROWSER_OPTIONS = {
14-
LocalChrome: {
15-
'browserName': 'chrome',
16-
17-
// Enables concurrent testing. Currently runs four e2e files in parallel.
18-
shardTestFiles: true,
19-
maxInstances: 4,
20-
},
21-
ChromeOnTravis: {
22-
browserName: 'chrome',
23-
chromeOptions: {
24-
'args': ['--no-sandbox'],
25-
'binary': process.env.CHROME_BIN,
26-
}
27-
}
28-
};
29-
3013
exports.config = {
3114
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
3215
allScriptsTimeout: 11000,
@@ -36,7 +19,12 @@ exports.config = {
3619
'**/key_events/**', // can't tell why this is failing
3720
'**/sourcemap/**' // fails only on travis
3821
],
39-
capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
22+
capabilities: {
23+
'browserName': 'chrome',
24+
// Enables concurrent testing. Currently runs four e2e files in parallel.
25+
shardTestFiles: true,
26+
maxInstances: 4,
27+
},
4028
directConnect: true,
4129
baseUrl: 'http://localhost:8000/',
4230
framework: 'jasmine2',

protractor-examples-e2e.conf.js

+5-17
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,16 @@ require('reflect-metadata');
1313

1414
Error.stackTraceLimit = 9999;
1515

16-
var BROWSER_OPTIONS = {
17-
LocalChrome: {
16+
exports.config = {
17+
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
18+
allScriptsTimeout: 11000,
19+
specs: ['dist/examples/**/e2e_test/*_spec.js'],
20+
capabilities: {
1821
'browserName': 'chrome',
19-
2022
// Enables concurrent testing. Currently runs four e2e files in parallel.
2123
shardTestFiles: true,
2224
maxInstances: 4,
2325
},
24-
ChromeOnTravis: {
25-
browserName: 'chrome',
26-
chromeOptions: {
27-
'args': ['--no-sandbox'],
28-
'binary': process.env.CHROME_BIN,
29-
}
30-
},
31-
};
32-
33-
exports.config = {
34-
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
35-
allScriptsTimeout: 11000,
36-
specs: ['dist/examples/**/e2e_test/*_spec.js'],
37-
capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
3826
directConnect: true,
3927
baseUrl: 'http://localhost:8001/',
4028
framework: 'jasmine2',

protractor-perf.conf.js

+6-27
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,26 @@ const isBazel = !!process.env.RUNFILES;
1717
const BASE = isBazel ? 'angular/modules' : 'dist/all';
1818
require(`./${BASE}/e2e_util/perf_util`).readCommandLine();
1919

20-
var CHROME_OPTIONS = {
20+
const CHROME_OPTIONS = {
2121
'args': ['--js-flags=--expose-gc', '--no-sandbox', '--headless', '--disable-dev-shm-usage'],
2222
'perfLoggingPrefs': {
2323
'traceCategories':
2424
'v8,blink.console,devtools.timeline,disabled-by-default-devtools.timeline,blink.user_timing'
2525
}
2626
};
2727

28-
var BROWSER_CAPS = {
29-
LocalChrome: {
28+
const config = {
29+
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
30+
restartBrowserBetweenTests: true,
31+
allScriptsTimeout: 11000,
32+
capabilities: {
3033
'browserName': 'chrome',
3134
chromeOptions: CHROME_OPTIONS,
3235
loggingPrefs: {
3336
performance: 'ALL',
3437
browser: 'ALL',
3538
}
3639
},
37-
ChromeOnTravis: {
38-
browserName: 'chrome',
39-
chromeOptions: mergeInto(CHROME_OPTIONS, {
40-
'binary': process.env.CHROME_BIN,
41-
}),
42-
loggingPrefs: {
43-
performance: 'ALL',
44-
browser: 'ALL',
45-
}
46-
}
47-
};
48-
49-
function mergeInto(src, target) {
50-
for (var prop in src) {
51-
target[prop] = src[prop];
52-
}
53-
return target;
54-
}
55-
56-
const config = {
57-
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
58-
restartBrowserBetweenTests: true,
59-
allScriptsTimeout: 11000,
60-
capabilities: process.env.TRAVIS ? BROWSER_CAPS.ChromeOnTravis : BROWSER_CAPS.LocalChrome,
6140
directConnect: true,
6241
framework: 'jasmine2',
6342
jasmineNodeOpts: {

scripts/ci/payload-size.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ addTimestamp() {
5151
payloadData="$payloadData\"timestamp\": $timestamp, "
5252
}
5353

54-
# Write travis commit message to global variable `$payloadData`.
54+
# Write the commit message for the current CI commit range to global variable `$payloadData`.
5555
# $1: string - The commit range for this build (in `<SHA-1>...<SHA-2>` format).
5656
addMessage() {
5757
commitRange="$1"

yarn.lock.readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ All of our npm dependencies are locked via the `yarn.lock` file for the followin
22

33
- our project has lots of dependencies which update at unpredictable times, so it's important that
44
we update them explicitly once in a while rather than implicitly when any of us runs `yarn install`
5-
- locked dependencies allow us to reuse yarn cache on travis, significantly speeding up our builds
5+
- locked dependencies allow us to reuse yarn cache on CircleCI, significantly speeding up our builds
66
(by 5 minutes or more)
77
- locked dependencies allow us to detect when node_modules folder is out of date after a branch switch
88
which allows us to build the project with the correct dependencies every time

0 commit comments

Comments
 (0)