Skip to content

Commit

Permalink
Merge pull request #208 from kiwiupover/test-against-ember-data-release
Browse files Browse the repository at this point in the history
Test against ember-data ^3.8.0

Co-authored-by: Robert Jackson <[email protected]>
  • Loading branch information
rwjblue and rwjblue authored Apr 11, 2019
2 parents 5d4cea6 + a2899fd commit d1068cf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ node_js:
- "10"

before_install:
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
- npm config set spin false

# TODO: remove when we stop testing against node 6
- if [[ `npm -v` < 6* ]]; then npm i -g npm@6; fi

- npm install -g bower
- bower --version
4 changes: 1 addition & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
environment:
matrix:
- nodejs_version: "4"
- nodejs_version: "6"
- nodejs_version: "8"
- nodejs_version: "10"
Expand All @@ -12,8 +11,7 @@ init:
# Install scripts. (runs after repo cloning)
install:
- ps: Install-Product node $env:nodejs_version
- npm i -g npm@^3
- npm config set spin false
- npm i -g npm@^6
- npm install -g bower
- npm install

Expand Down
2 changes: 1 addition & 1 deletion lib/utilities/pristine.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function installPristineApp(appName, options) {
hasBowerComponents,
skipNpm,
emberVersion: options.emberVersion || 'canary',
emberDataVersion: options.emberDataVersion || 'emberjs/data#master'
emberDataVersion: options.emberDataVersion || '~3.8.0'
};

promise = promise
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"chai": "^4.0.2",
"cross-env": "^5.0.0",
"ember-cli": "~2.17.1",
"ember-cli": "~3.8.0",
"ember-cli-fastboot": "^1.0.0",
"eslint-config-sane": "^0.6.0",
"eslint-plugin-prefer-let": "^1.0.1",
Expand Down

0 comments on commit d1068cf

Please sign in to comment.