Skip to content

Commit d1068cf

Browse files
rwjblueRobert Jackson
andauthored
Merge pull request tomdale#208 from kiwiupover/test-against-ember-data-release
Test against ember-data ^3.8.0 Co-authored-by: Robert Jackson <[email protected]>
2 parents 5d4cea6 + a2899fd commit d1068cf

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ node_js:
55
- "10"
66

77
before_install:
8-
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
9-
- npm config set spin false
8+
9+
# TODO: remove when we stop testing against node 6
10+
- if [[ `npm -v` < 6* ]]; then npm i -g npm@6; fi
11+
1012
- npm install -g bower
1113
- bower --version

appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
environment:
22
matrix:
3-
- nodejs_version: "4"
43
- nodejs_version: "6"
54
- nodejs_version: "8"
65
- nodejs_version: "10"
@@ -12,8 +11,7 @@ init:
1211
# Install scripts. (runs after repo cloning)
1312
install:
1413
- ps: Install-Product node $env:nodejs_version
15-
- npm i -g npm@^3
16-
- npm config set spin false
14+
- npm i -g npm@^6
1715
- npm install -g bower
1816
- npm install
1917

lib/utilities/pristine.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function installPristineApp(appName, options) {
9595
hasBowerComponents,
9696
skipNpm,
9797
emberVersion: options.emberVersion || 'canary',
98-
emberDataVersion: options.emberDataVersion || 'emberjs/data#master'
98+
emberDataVersion: options.emberDataVersion || '~3.8.0'
9999
};
100100

101101
promise = promise

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"devDependencies": {
3535
"chai": "^4.0.2",
3636
"cross-env": "^5.0.0",
37-
"ember-cli": "~2.17.1",
37+
"ember-cli": "~3.8.0",
3838
"ember-cli-fastboot": "^1.0.0",
3939
"eslint-config-sane": "^0.6.0",
4040
"eslint-plugin-prefer-let": "^1.0.1",

0 commit comments

Comments
 (0)