Skip to content

Commit

Permalink
Kick off 2.0-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
mixonic committed Aug 10, 2020
1 parent 4c787b2 commit 359a55f
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 38 deletions.
30 changes: 15 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "8"
- "10"

sudo: false
dist: trusty
dist: xenial

addons:
chrome: stable
Expand All @@ -22,29 +21,29 @@ env:
branches:
only:
- master
- 2.0-beta
# npm version tags
- /^v\d+\.\d+\.\d+/

jobs:
fail_fast: true
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

# runs linting and tests with locked deps
- stage: "Tests"
name: "Tests"
install:
- travis_retry yarn install --non-interactive
script:
- yarn lint:hbs
- yarn lint:js
- travis_retry yarn test
- yarn lint
- yarn test:ember

- name: "Floating Dependencies"
- stage: "Additional Tests"
name: "Floating Dependencies"
install:
- yarn install --no-lockfile --non-interactive
script:
- travis_retry yarn test
- yarn test:ember

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
Expand All @@ -62,13 +61,14 @@ before_install:
- yarn global add greenkeeper-lockfile@1

install:
- travis_retry yarn install --no-lockfile --non-interactive
- yarn install --non-interactive

before_script:
- greenkeeper-lockfile-update

script:
- travis_retry node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
- yarn lint
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

after_script:
- greenkeeper-lockfile-upload
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ ember install @html-next/vertical-collection
| `vertical-collection` version | Supported Ember versions |
| ----------------------------- | ------------------------ |
| `^v1.0.0` | `v1.12.0 - v3.8.0` |
| `^v2.0.0` | `v3.8.0+` |
| `^v2.0.0` | `v2.4.0+` |

## Support, Questions, Collaboration

Expand Down
16 changes: 0 additions & 16 deletions app/initializers/vertical-collection-legacy-compat.js

This file was deleted.

48 changes: 48 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,54 @@ module.exports = async function() {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.4',
bower: {
dependencies: {
ember: 'components/ember#lts-2-4',
},
resolutions: {
ember: 'lts-2-4',
},
},
npm: {
devDependencies: {
'ember-source': null
},
},
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
ember: 'components/ember#lts-2-8',
},
resolutions: {
ember: 'lts-2-8',
},
},
npm: {
devDependencies: {
'ember-source': null
},
},
},
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
},
},
},
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
},
},
},
{
name: 'ember-lts-3.4',
npm: {
Expand Down
4 changes: 0 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ module.exports = {
exclude.push('initializers/debug.js');
}

if (this.checker.forEmber().isAbove('1.13.0')) {
exclude.push('initializers/vertical-collection-legacy-compat.js');
}

return new Funnel(tree, { exclude });
}
};
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"broccoli-merge-trees": "^3.0.1",
"broccoli-rollup": "^4.1.1",
"ember-cli-babel": "^7.7.3",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-version-checker": "^3.1.3",
"ember-raf-scheduler": "0.1.0"
},
Expand Down Expand Up @@ -91,7 +91,7 @@
"qunit-dom": "^0.9.0"
},
"engines": {
"node": "8.* || >= 10.*"
"node": ">= 10.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down

0 comments on commit 359a55f

Please sign in to comment.