Skip to content

Commit

Permalink
Merge pull request #28 from Addepar/mixonic/bump-deps
Browse files Browse the repository at this point in the history
Bump dependencies, use GH actions
  • Loading branch information
mixonic authored Feb 5, 2021
2 parents 1c996ec + 6889c37 commit 6d52831
Show file tree
Hide file tree
Showing 16 changed files with 4,350 additions and 1,537 deletions.
73 changes: 73 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Ember Classy Page Object 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: Run Tests
run: yarn test:ember
env:
CI: true

test-ember-try:
name: Run Tests
runs-on: ubuntu-18.04
strategy:
matrix:
ember-version:
[
ember-lts-2.8,
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
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

190 changes: 112 additions & 78 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,84 +1,118 @@
/* eslint-env node */
module.exports = {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
const getChannelURL = require('ember-source-channel-url');

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary'),
]).then(urls => {
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,
},
},
},
resolutions: {
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0',
},
},
},
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0',
},
},
},
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0',
},
},
},
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0',
},
},
},
{
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: {
devDependencies: {
'ember-source': urls[0],
},
},
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1],
},
},
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2],
},
},
},
{
name: 'ember-default',
npm: {
devDependencies: {},
},
},
]
};
});
};
38 changes: 20 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,42 @@
"doc": "doc",
"test": "tests"
},
"repository": "github:pzuraq/ember-classy-page-object",
"repository": "https://github.com/Addepar/ember-classy-page-object",
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember try:each"
"start": "ember serve",
"test": "ember try:each",
"test:ember": "ember test"
},
"dependencies": {
"broccoli-funnel": "^2.0.1",
"ember-cli-babel": "^6.6.0",
"ember-cli-page-object": "^1.15.4"
"ember-cli-babel": "^7.12.0",
"ember-cli-page-object": "^1.17.5"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.16.2",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.0.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli": "~3.1.4",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.16.0",
"ember-test-selectors": "^0.3.8",
"ember-qunit": "^4.5.1",
"ember-load-initializers": "^2.0.0",
"ember-resolver": "^5.1.1",
"ember-source": "~3.24.0",
"ember-source-channel-url": "^1.0.1",
"ember-test-selectors": "^5.0.0",
"ember-try": "^1.1.0",
"loader.js": "^4.2.3"
},
"engines": {
"node": "8.* || >= 10.*"
"node": ">= 10.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
Loading

0 comments on commit 6d52831

Please sign in to comment.