Skip to content

Commit

Permalink
Merge pull request #158 from rwwagner90/bump-deps
Browse files Browse the repository at this point in the history
Bump deps, Ember 3.22, yarn upgrade
  • Loading branch information
paulcwatts committed Dec 23, 2020
2 parents 731db93 + cb79e9d commit ef51b82
Show file tree
Hide file tree
Showing 7 changed files with 2,560 additions and 2,419 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

64 changes: 64 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: CI Build

on:
pull_request: {}
push:
branches:
- master
tags:
- v*

jobs:
test:
name: Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 10.x
- run: yarn install --frozen-lockfile
- run: yarn lint
- run: yarn test:ember

floating-dependencies:
name: "Floating Dependencies"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 10.x
- run: yarn install --no-lockfile
- run: yarn test:ember

try-scenarios:
name: "Try: ${{ matrix.ember-try-scenario }}"

runs-on: ubuntu-latest

needs: test

strategy:
fail-fast: false
matrix:
ember-try-scenario:
- ember-lts-3.16
- ember-lts-3.20
- ember-release
- ember-beta
- ember-canary
- ember-default-with-jquery
- ember-classic

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 12.x
- name: install dependencies
run: yarn install --frozen-lockfile
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
65 changes: 0 additions & 65 deletions .travis.yml

This file was deleted.

10 changes: 5 additions & 5 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ module.exports = async function() {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.12',
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.12.0'
'ember-source': '~3.16.0'
}
}
},
{
name: 'ember-lts-3.16',
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
'ember-source': '~3.20.5'
}
}
},
Expand Down Expand Up @@ -55,7 +55,7 @@ module.exports = async function() {
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
'@ember/jquery': '^1.1.0'
}
}
},
Expand Down
46 changes: 25 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,45 +24,45 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@aws-amplify/auth": "^3.3.4",
"@aws-amplify/core": "^3.4.5",
"amazon-cognito-identity-js": "^4.3.3",
"ember-auto-import": "^1.6.0",
"ember-cli-babel": "^7.21.0",
"ember-cli-htmlbars": "^5.2.0"
"@aws-amplify/auth": "^3.4.15",
"@aws-amplify/core": "^3.8.7",
"amazon-cognito-identity-js": "^4.5.5",
"ember-auto-import": "^1.9.0",
"ember-cli-babel": "^7.22.1",
"ember-cli-htmlbars": "^5.3.1"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.1",
"@glimmer/tracking": "^1.0.0",
"@ember/optional-features": "^2.0.0",
"@glimmer/component": "^1.0.2",
"@glimmer/tracking": "^1.0.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.20.0",
"ember-cli-code-coverage": "^1.0.0-beta.9",
"ember-cli": "~3.22.0",
"ember-cli-code-coverage": "^1.0.2",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
"ember-cli-terser": "^4.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.0",
"ember-simple-auth": "^3.0.0",
"ember-resolver": "^8.0.2",
"ember-simple-auth": "^3.0.1",
"ember-sinon": "^5.0.0",
"ember-source": "~3.20.2",
"ember-source": "~3.23.1",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^2.9.1",
"ember-template-lint": "^2.14.0",
"ember-try": "^1.4.0",
"eslint": "^7.5.0",
"eslint": "^7.11.0",
"eslint-plugin-disable-features": "^0.1.3",
"eslint-plugin-ember": "^8.9.1",
"eslint-plugin-ember": "^9.3.0",
"eslint-plugin-node": "^11.1.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit-dom": "^1.2.0",
"release-it": "^13.6.7"
"qunit-dom": "^1.5.0",
"release-it": "^14.2.2"
},
"release-it": {
"github": {
Expand Down Expand Up @@ -90,5 +90,9 @@
"ember-cli-htmlbars-inline-precompile",
"loader.js"
]
},
"volta": {
"node": "10.23.0",
"yarn": "1.22.10"
}
}
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.20.0",
"version": "3.22.0",
"blueprints": [
{
"name": "addon",
Expand Down
Loading

0 comments on commit ef51b82

Please sign in to comment.