Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit e97d5f1

Browse files
Splaktarjelbourn
Splaktar
authored and
jelbourn
committed
chore(ci): use ChromeHeadless and FirefoxHeadless on Travis (#11455)
fix gulp errors with NodeJS 10 switch to NodeJS 10 improve NPM configuration via `npm ci` and caching "$HOME/.npm" fix keywords entry in package.json disable Saucelabs update readme, docs, deps to AngularJS 1.7.4 Fixes #11410
1 parent 0671aab commit e97d5f1

File tree

10 files changed

+122
-140
lines changed

10 files changed

+122
-140
lines changed

‎.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
language: node_js
2+
dist: trusty
3+
addons:
4+
chrome: stable
5+
firefox: latest
26
sudo: false
37

48
node_js:
5-
- '8'
9+
- '10'
610

711
env:
812
global:
@@ -13,10 +17,12 @@ env:
1317
- BROWSER_STACK_USERNAME=angularteam1
1418
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
1519
- secure: X7CNmOMemAJ9Jqrsmv6MXyeh8n8TIL5CKzE9LYsZUbsyKo0l5CyyysJq0y/AbpQS6awsSv2qP/cZ/kand6r6z0wMFbUcxa4HjMZEfRwv3sGtwj1OKJko/GvjcZQzD54FtHy1NU7wR0mYhAlE5IwH7f8bMa/nUiijgD/TOCTtKH8=
20+
- MOZ_HEADLESS=1
1621

1722
cache:
1823
directories:
1924
- node_modules/
25+
- "$HOME/.npm"
2026
- tmp/angular.js
2127

2228
branches:
@@ -35,7 +41,7 @@ jobs:
3541
env: "MODE=release"
3642

3743
install:
38-
- npm install
44+
- npm ci
3945
- npm rebuild node-sass
4046

4147
before_script:

‎README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ We have three types of releases:
6363

6464
##### Patch Releases
6565

66-
The patch builds (1.1.4, 1.1.5, 1.1.6) are prepared based on commits in the `master` branch; which contains only
67-
non-breaking changes (I.e. bug fixes, new features, API additions, and minimal non-breaking CSS changes).
68-
We are targeting `patch` releases every 2 weeks.
66+
The patch builds (1.1.8, 1.1.9, 1.1.10, etc.) are prepared based on commits in the `master` branch;
67+
which contains only non-breaking changes (I.e. bug fixes, new features, API additions, and minimal
68+
non-breaking CSS changes). We are targeting `patch` releases every 2 weeks.
6969

7070
##### Minor Releases
7171

@@ -173,13 +173,13 @@ when using online tools such as [CodePen](http://codepen.io/), [Plunker](http://
173173
<body>
174174

175175
<!-- AngularJS Material Dependencies -->
176-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular.min.js"></script>
177-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-animate.min.js"></script>
178-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-aria.min.js"></script>
179-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-messages.min.js"></script>
176+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular.min.js"></script>
177+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-animate.min.js"></script>
178+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-aria.min.js"></script>
179+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-messages.min.js"></script>
180180

181-
<!-- AngularJS Material Javascript now available via Google CDN; version 1.1.4 used here -->
182-
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.9/angular-material.min.js"></script>
181+
<!-- AngularJS Material Javascript now available via Google CDN; version 1.1.10 used here -->
182+
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.10/angular-material.min.js"></script>
183183
</body>
184184
```
185185

@@ -197,10 +197,10 @@ pull directly from the distribution GitHub
197197
<body>
198198

199199
<!-- AngularJS Material Dependencies -->
200-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.js"></script>
201-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular-animate.js"></script>
202-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular-aria.js"></script>
203-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular-messages.min.js"></script>
200+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular.js"></script>
201+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-animate.js"></script>
202+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-aria.js"></script>
203+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-messages.min.js"></script>
204204

205205
<!-- AngularJS Material Javascript using GitCDN to load directly from `bower-material/master` -->
206206
<script src="https://cdn.gitcdn.link/cdn/angular/bower-material/master/angular-material.js"></script>

‎config/build.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const pkg = require('../package.json');
22

33
module.exports = {
4-
ngVersion: '1.7.2',
4+
ngVersion: '1.7.4',
55
version: pkg.version,
66
repository: pkg.repository.url
77
.replace(/^git/,'https')

‎config/karma-ci.conf.js renamed to ‎config/karma-jenkins.conf.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,6 @@ module.exports = function(config) {
1818
client: {
1919
// Do not clear the context as this can cause reload failures with Jasmine
2020
clearContext: false
21-
},
22-
23-
// This is the new content for your travis-ci configuration test
24-
// Custom launcher for Travis-CI
25-
customLaunchers: {
26-
Chrome_travis_ci: {
27-
base: 'Chrome',
28-
flags: ['--no-sandbox']
29-
}
3021
}
3122
});
32-
33-
const browsers = process.env.TRAVIS ? ['Chrome_travis_ci'] : [];
34-
config.browsers = browsers.concat(config.browsers);
35-
3623
};

‎config/karma-travis.conf.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
const baseKarma = require('./karma.conf.js');
2+
3+
module.exports = function(config) {
4+
baseKarma(config);
5+
6+
// Override defaults with custom CI settings
7+
config.set({
8+
colors: false,
9+
10+
browsers: ['ChromeHeadlessNoSandbox', 'FirefoxHeadless'],
11+
customLaunchers: {
12+
ChromeHeadlessNoSandbox: {
13+
base: 'ChromeHeadless',
14+
flags: ['--no-sandbox']
15+
},
16+
FirefoxHeadless: {
17+
base: 'Firefox',
18+
flags: ['-headless'],
19+
},
20+
},
21+
22+
client: {
23+
// Do not clear the context as this can cause reload failures with Jasmine
24+
clearContext: false
25+
}
26+
});
27+
};

‎config/karma.conf.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
const sauceBrowsers = require('./sauce-browsers.json');
21
const path = require('path');
32

43
module.exports = function(config) {
54

65
const UNCOMPILED_SRC = [
76

8-
// To enabled use of `gulp karma-watch`,
9-
// don't use the dist/angular-material.js
10-
//
7+
// To enable use of `gulp karma-watch`,
8+
// don't use the dist/angular-material.js.
119
//'dist/angular-material.js', // Un-minified source
1210

1311

@@ -47,13 +45,16 @@ module.exports = function(config) {
4745
const testSrc = process.env.KARMA_TEST_COMPRESSED ? COMPILED_SRC : UNCOMPILED_SRC;
4846

4947
config.set({
50-
5148
basePath: path.join(__dirname, '/..'),
49+
plugins: [
50+
require("karma-jasmine"),
51+
require("karma-chrome-launcher"),
52+
require('karma-firefox-launcher')
53+
],
5254
frameworks: ['jasmine'],
5355
files: dependencies.concat(testSrc),
54-
customLaunchers: sauceBrowsers,
5556

56-
browserDisconnectTimeout:500,
57+
browserDisconnectTimeout: 500,
5758

5859
logLevel: config.LOG_DEBUG,
5960
port: 9876,
@@ -80,5 +81,4 @@ module.exports = function(config) {
8081
clearContext:false
8182
}
8283
});
83-
8484
};

‎package-lock.json

Lines changed: 36 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)