Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Vertical Collection CI
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
test:
name: Run Tests
runs-on: ubuntu-18.04

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Use Node 12
uses: actions/setup-node@v2-beta
with:
node-version: 12.x

- name: Node Modules Cache
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-yarn-${{ hashFiles('**/yarn.lock') }}

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Lint
run: yarn lint

- name: Run Tests
run: yarn test:ember
env:
CI: true

test-ember-try:
name: Run Tests
runs-on: ubuntu-18.04
strategy:
matrix:
ember-version:
[
# The test suite only support Ember 3.x
# ember-lts-2.8,
Comment thread
mixonic marked this conversation as resolved.
Outdated
# ember-lts-2.12,
# ember-lts-2.18,
ember-lts-3.4,
ember-lts-3.8,
ember-lts-3.12,
ember-lts-3.16,
ember-lts-3.20,
ember-release,
ember-beta,
ember-canary,
]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Use Node 12
uses: actions/setup-node@v2-beta
with:
node-version: 12.x

- name: Node Modules Cache
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ci-yarn-${{ matrix.ember-version }}-${{ hashFiles('**/yarn.lock') }}

- name: Install
run: yarn install --frozen-lockfile --ignore-engines

- name: Run Tests
run: node_modules/.bin/ember try:one ${{ matrix.ember-version }} --skip-cleanup
38 changes: 22 additions & 16 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,34 +21,40 @@ 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
- env: EMBER_TRY_SCENARIO=ember-lts-2.8
Comment thread
mixonic marked this conversation as resolved.
Outdated
- env: EMBER_TRY_SCENARIO=ember-lts-2.12
- env: EMBER_TRY_SCENARIO=ember-lts-2.18

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)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-2.8
- env: EMBER_TRY_SCENARIO=ember-lts-2.12
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
Expand All @@ -62,13 +67,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.8.0+` |

## Support, Questions, Collaboration

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

This file was deleted.

6 changes: 1 addition & 5 deletions config/ember-cli-toolbelts.json
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
{
"babel": {
"includePolyfill": true
}
}
{}
56 changes: 56 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,38 @@ module.exports = async function() {
return {
useYarn: true,
scenarios: [
{
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 All @@ -22,6 +54,30 @@ module.exports = async function() {
}
}
},
{
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.12.0'
}
}
},
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
}
}
},
{
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.20.0'
}
}
},
{
name: 'ember-release',
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
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,23 @@
"bugs": "https://github.com/html-next/vertical-collection/issues",
"scripts": {
"build": "ember build",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each"
"test": "npm-run-all lint:* test:*",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"babel6-plugin-strip-class-callcheck": "^6.0.0",
"broccoli-funnel": "^2.0.2",
"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-babel": "^7.12.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-version-checker": "^3.1.3",
"ember-raf-scheduler": "0.1.0"
"ember-raf-scheduler": "0.2.0"
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
Expand All @@ -73,12 +75,11 @@
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^3.0.0",
"ember-code-snippet": "^2.4.1",
"ember-data": "^3.11.4",
"ember-data": "~3.11.4",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-native-dom-helpers": "^0.6.3",
"ember-native-dom-helpers": "^0.7.0",
"ember-perf-timeline": "^1.2.1",
"ember-qunit": "^4.5.1",
"ember-resolver": "^5.0.1",
Expand All @@ -88,10 +89,11 @@
"eslint-plugin-ember": "^6.7.1",
"eslint-plugin-node": "^9.1.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit-dom": "^0.9.0"
},
"engines": {
"node": "8.* || >= 10.*"
"node": ">= 10.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
7 changes: 0 additions & 7 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ const browsers = [
'last 1 Safari versions'
];

const isCI = !!process.env.CI;
const isProduction = process.env.EMBER_ENV === 'production';
Comment thread
mixonic marked this conversation as resolved.

if (isCI || isProduction) {
browsers.push('ie 11');
}

module.exports = {
browsers
};
Loading