Merge pull request #470 from wozny1989/bump-to-Ember-4-x

Upgrade to Ember 5

.github/workflows/ci.yml

@@ -3,73 +3,92 @@ name: CI
 on:
   push:
     branches:
+      - main
       - master
   pull_request: {}
 
-jobs:
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
-  lint:
-    name: "Lint"
-    env:
-      CI: true
+jobs:
+  test:
+    name: 'Tests'
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
+    timeout-minutes: 10
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Install node
-      uses: actions/setup-node@v2-beta
-      with:
-        node-version: 12.x
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 9
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Lint
+        run: pnpm run lint
+        working-directory: ember-infinity
+      - name: Lint Test App
+        run: pnpm run lint
+        working-directory: test-app
+      - name: Run Tests
+        run: pnpm run test:test-app
 
-    - name: Get yarn cache
-      id: yarn-cache
-      run: echo "::set-output name=dir::$(yarn cache dir)"
+  floating:
+    name: 'Floating Dependencies'
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
 
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.yarn-cache.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-         ${{ runner.os }}-yarn-
-    - name: yarn install
-      run: yarn
-    - name: lint
-      run: yarn lint:js
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 9
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Run Tests
+        run: pnpm run test:test-app
 
-  floating:
-    name: "Floating dependencies"
-    env:
-      CI: true
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
+    needs: 'test'
+
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        try-scenario: [
-          ember-lts-3.12,
-          ember-lts-3.16,
-          ember-lts-3.20,
-          # ember-beta,
-          # ember-release,
-        ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install node
-      uses: actions/setup-node@v2-beta
-      with:
-        node-version: 12.x
-
-    - name: Get yarn cache
-      id: yarn-cache
-      run: echo "::set-output name=dir::$(yarn cache dir)"
+        try-scenario:
+          - ember-classic
+          - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-lts-4.8
+          - ember-lts-4.12
+          - ember-lts-5.4
+          - ember-lts-5.8
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - embroider-safe
+          - embroider-optimized
 
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.yarn-cache.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-         ${{ runner.os }}-yarn-
-    - name: yarn install
-      run: yarn
-    - name: test
-      run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 9
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Run Tests
+        env:
+          EMBER_TRY_SCENARIO: ${{ matrix.try-scenario }}
+        run: npm run test:test-app:ember-try $EMBER_TRY_SCENARIO

.gitignore

@@ -1,25 +1,2 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
-
-# misc
-/.env*
-/.pnp*
-/.sass-cache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/npm-debug.log*
-/testem.log
-/yarn-error.log
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
+node_modules
+.DS_Store

CONTRIBUTING.md

@@ -2,25 +2,25 @@
 
 ## Installation
 
-* `git clone <repository-url>`
-* `cd ember-infinity`
-* `yarn install`
+- `git clone <repository-url>`
+- `cd ember-infinity`
+- `pnpm install`
 
 ## Linting
 
-* `yarn lint:hbs`
-* `yarn lint:js`
-* `yarn lint:js --fix`
+- `pnpm run lint:hbs`
+- `pnpm run lint:js`
+- `pnpm run lint:js --fix`
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+- `ember test` – Runs the test suite on the current Ember version
+- `ember test --server` – Runs the test suite in "watch mode"
+- `ember try:each` – Runs the test suite against multiple Ember versions
 
-## Running the dummy application
+## Running the test-app application
 
-* `ember serve`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+- `ember serve`
+- Visit the test-app application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).