Merge pull request #498 from NullVoxPopuli/upgrade-pnpm

chore(internal): re-work ci to be simpler to maintain

.github/workflows/ci.yml

@@ -11,8 +11,69 @@ env:
   CI: true
   dist: ember-resources/dist
 jobs:
+  install_dependencies:
+    name: Install Dependencies
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: volta-cli/action@v1
+      - name: Cache pnpm modules
+        uses: actions/cache@v3
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+      - uses: pnpm/[email protected]
+        with:
+          version: 7.1.2
+      - name: Install Dependencies
+        run: pnpm install
+  eslint:
+    name: ESLint
+    needs:
+      - install_dependencies
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        path:
+          - ./ember-resources
+          - ./testing/ember-app
+    steps:
+      - uses: actions/checkout@v3
+      - uses: volta-cli/action@v1
+      - name: Cache pnpm modules
+        uses: actions/cache@v3
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+      - uses: pnpm/[email protected]
+        with:
+          version: 7.1.2
+      - name: Install Dependencies
+        run: pnpm install
+      - name: ESLint
+        run: pnpm run lint:js
+        working-directory: ${{ matrix.path }}
+  commits:
+    name: Commit Messages
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: volta-cli/action@v1
+      - uses: wagoid/[email protected]
   build_test:
     name: Build Tests
+    needs:
+      - install_dependencies
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
@@ -27,7 +88,7 @@ jobs:
             ${{ runner.os }}-
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
         run: pnpm install
       - name: Build and Assert Output
@@ -55,7 +116,7 @@ jobs:
             ${{ runner.os }}-
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
         run: pnpm install
       - name: Download built package from cache
@@ -87,7 +148,7 @@ jobs:
             ${{ runner.os }}-
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
         run: pnpm install
       - name: Download built package from cache
@@ -107,7 +168,7 @@ jobs:
       - uses: volta-cli/action@v1
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
         run: rm pnpm-lock.yaml && pnpm install
       - name: Download built package from cache
@@ -117,7 +178,7 @@ jobs:
           path: ${{ env.dist }}
       - run: pnpm --filter ember-app run ember:test
   try-scenarios:
-    name: "Compat: ${{ matrix.ember-try-scenario }}"
+    name: ${{ matrix.ember-try-scenario }}
     timeout-minutes: 10
     runs-on: ubuntu-latest
     needs: tests
@@ -139,8 +200,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: volta-cli/action@v1
-        with:
-          node-version: 12.x
       - name: Cache pnpm modules
         uses: actions/cache@v3
         with:
@@ -150,7 +209,7 @@ jobs:
             ${{ runner.os }}-
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
         run: pnpm install
       - name: Download built package from cache
@@ -164,7 +223,7 @@ jobs:
           node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }}
           --skip-cleanup
   typescript-compatibility:
-    name: Type checking - ${{ matrix.typescript-scenario }}
+    name: ${{ matrix.typescript-scenario }}
     timeout-minutes: 5
     runs-on: ubuntu-latest
     continue-on-error: true
@@ -178,14 +237,12 @@ jobs:
           - [email protected]
           - [email protected]
           - [email protected]
-          - typescript@next
+          - typescript@4.7
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - uses: volta-cli/action@v1
-        with:
-          node-version: 12.x
       - name: Cache pnpm modules
         uses: actions/cache@v3
         with:
@@ -195,9 +252,9 @@ jobs:
             ${{ runner.os }}-
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
-        run: pnpm install
+        run: rm pnpm-lock.yaml && pnpm install
       - name: Download built package from cache
         uses: actions/download-artifact@v3
         with:
@@ -207,7 +264,9 @@ jobs:
         run: pnpm add --save-dev ${{ matrix.typescript-scenario }}
         working-directory: testing/ember-app
       - name: Type checking
-        run: pnpm --filter ember-app exec tsc --build
+        run: |
+          pnpm --filter ember-app exec tsc -v
+          pnpm --filter ember-app exec tsc --build
   publish:
     name: Release
     timeout-minutes: 5
@@ -232,7 +291,7 @@ jobs:
             ${{ runner.os }}-
       - uses: pnpm/[email protected]
         with:
-          version: 6.32.1
+          version: 7.1.2
       - name: Install Dependencies
         run: pnpm install
       - name: Download built package from cache

.npmrc

@@ -1,5 +1,3 @@
-public-hoist-pattern[]=*@types*
-
 # Required because broccoli has hard-coded paths to *all* packages
 # not just relevant ones..........
 public-hoist-pattern[]=eslint-plugin*