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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 9 deletions
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

Lines changed: 0 additions & 9 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 7 deletions
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

Lines changed: 1 addition & 7 deletions
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

Lines changed: 0 additions & 5 deletions
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

Lines changed: 0 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 5 deletions
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/',

0 commit comments

Comments
 (0)