Skip to content

Commit

Permalink
Fix TravisCI builds (#1875)
Browse files Browse the repository at this point in the history
* ember-try: Fix broken `ember-data` dependency declarations

`ember-data` is a monorepo now, so these kinds of version constraint declarations won't work anymore. see emberjs/data#6010

* CI: Use default dependencies for default scenarios

The `latest` version of ember-data (v3.11) is using async/await in Node.js code, but since we run CI on Node.js 6 it does not support that yet. This means we will have to use an older version of ember-data for now until we drop support for Node.js 6.

* CI: Allow failures for `ember-beta` scenario

see previous commit about async/await usage in recent ember-data releases

* package.json: Pin `cssstyle` to v1.2.x

see jsdom/cssstyle#95

* package.json: Pin `ember-data` to v3.7.x

Using `^3.0.0` currently resolves to v3.11.x which is not compatible with Node.js 6 anymore. v3.8.x and above have some other issues so we will use v3.7.x until we figure those out.

* Revert "Build(deps-dev): bump mermaid from 7.1.2 to 8.0.0 (#1765)"

This reverts commit 95ae7cb.

Some dependencies of `mermaid@8` are incompatible with Node.js 6
  • Loading branch information
Turbo87 authored and marcoow committed Jul 4, 2019
1 parent e102834 commit 0f1fc69
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 400 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ env:
jobs:
fail_fast: true
allow_failures:
- env: SCRIPT="test:one ember-beta"
- env: SCRIPT="test:one ember-canary"
- env: SCRIPT=test:fastboot

Expand All @@ -27,10 +28,10 @@ jobs:
- name: 'Fixed Dependencies'
install:
- yarn install --non-interactive
env: SCRIPT="test:one ember-release"
env: SCRIPT="test"

- name: 'Floating Dependencies'
env: SCRIPT="test:one ember-release"
env: SCRIPT="test"

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
Expand Down
6 changes: 3 additions & 3 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ module.exports = function() {
},
npm: {
devDependencies: {
'ember-data': 'emberjs/data#release',
'ember-data': 'latest',
'ember-source': releaseUrl,
},
},
Expand All @@ -193,7 +193,7 @@ module.exports = function() {
},
npm: {
devDependencies: {
'ember-data': 'emberjs/data#1df833396855d956b817540923dd89338463fec2',
'ember-data': 'beta',
'ember-source': betaUrl,
},
},
Expand All @@ -208,7 +208,7 @@ module.exports = function() {
},
npm: {
devDependencies: {
'ember-data': 'emberjs/data#1df833396855d956b817540923dd89338463fec2',
'ember-data': 'canary',
'ember-source': canaryUrl,
},
},
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^2.0.0",
"ember-data": "^3.0.0",
"ember-data": "~3.7.0",
"ember-debug-handlers-polyfill": "^1.1.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
Expand All @@ -87,7 +87,7 @@
"handlebars": "~4.1.1",
"loader.js": "^4.5.1",
"marked": "^0.6.0",
"mermaid": "^8.0.0",
"mermaid": "^7.0.3",
"mocha": "^6.0.2",
"mocha-only-detector": "^1.0.0",
"morgan": "^1.8.2",
Expand All @@ -114,6 +114,7 @@
]
},
"resolutions": {
"cssstyle": "~1.2.2",
"jsdom": "^11.10.0"
}
}
Loading

0 comments on commit 0f1fc69

Please sign in to comment.