Skip to content

Commit

Permalink
Merge pull request #178 from empress/update-ember
Browse files Browse the repository at this point in the history
Update to 4.8 with ember-cli-update
  • Loading branch information
mansona committed Aug 15, 2023
2 parents d00df38 + 47a55aa commit f098d5a
Show file tree
Hide file tree
Showing 7 changed files with 706 additions and 1,659 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
test:
name: "Tests"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
Expand All @@ -31,6 +32,7 @@ jobs:
floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -61,8 +63,8 @@ jobs:
try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
timeout-minutes: 15
needs: "test"
timeout-minutes: 10

strategy:
fail-fast: false
Expand All @@ -72,6 +74,7 @@ jobs:
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-lts-4.4
- ember-release
- ember-data-latest
- ember-beta
Expand Down
12 changes: 12 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = async function () {
devDependencies: {
'ember-source': '~3.16.0',
'ember-data': '~3.16.0',
'ember-qunit': '6.0.0',
}
}
},
Expand All @@ -22,6 +23,7 @@ module.exports = async function () {
devDependencies: {
'ember-source': '~3.20.5',
'ember-data': '~3.20.0',
'ember-qunit': '6.0.0',
},
},
},
Expand All @@ -31,6 +33,7 @@ module.exports = async function () {
devDependencies: {
'ember-source': '~3.24.3',
'ember-data': '~3.24.0',
'ember-qunit': '6.0.0',
},
},
},
Expand All @@ -43,6 +46,15 @@ module.exports = async function () {
},
},
},
{
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-data': '~4.4.0',
},
},
},
{
name: 'ember-data-latest',
npm: {
Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
fingerprint: {
extensions: ['js', 'css', 'map']
},
Expand Down
Loading

0 comments on commit f098d5a

Please sign in to comment.