Skip to content

Commit

Permalink
update to Ember v4.0 with ember-cli-update
Browse files Browse the repository at this point in the history
  • Loading branch information
mansona committed May 23, 2023
1 parent 3c54df5 commit 4696676
Show file tree
Hide file tree
Showing 12 changed files with 993 additions and 795 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = {
extends: ['plugin:node/recommended'],
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
Expand Down
57 changes: 27 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,21 @@ name: CI
on:
push:
branches:
- master
- main
- "v*"
pull_request:
- master
pull_request: {}

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

env:
FORCE_COLOR: 1
NODE_VERSION: 16.x

jobs:
lint:
name: Linting
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- run: npm ci
- run: npm run lint:hbs
- run: npm run lint:js

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

steps:
Expand All @@ -38,11 +27,15 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
- run: npm ci
- name: Lint
run: npm run lint
- name: Run Tests
- run: npm run test:ember

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

steps:
Expand All @@ -51,39 +44,43 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- run: npm install --no-package-lock
- run: npm run test:ember
- name: Install Dependencies
run: npm install --no-package-lock
- name: Run Tests
run: npm run test:ember

try-scenarios:
name: "ember-try: ${{ matrix.ember-try-scenario }}"
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
timeout-minutes: 10
needs: test
needs: 'test'

strategy:
fail-fast: false
matrix:
ember-try-scenario:
try-scenario:
- ember-lts-3.16
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-release
- ember-beta
- ember-canary
- ember-default-with-jquery
- ember-classic
- ember-default-with-jquery
- embroider-safe
- embroider-optimized
- no-deprecations
- ember-release-no-deprecations

steps:
- uses: actions/checkout@v3
- name: Install Node
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- run: npm ci

- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
- name: Install Dependencies
run: npm ci
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

/.changelog/
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
Expand All @@ -33,4 +34,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
Loading

0 comments on commit 4696676

Please sign in to comment.