chore(ci): fix compatibility tests and deploy

projectcaluma · Dec 6, 2023 · 67c24b6 · 67c24b6
1 parent ce00677
commit 67c24b6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 57 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -20,17 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: "pnpm"
-
-      - name: Install Dependencies
-        run: pnpm install
-
       - name: Deploy to Github Pages
-        run: pnpm --filter ember-caluma ember deploy production
+        run: pnpm --filter ember-caluma exec ember deploy production
         env:
           DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
           ADDON_DOCS_UPDATE_LATEST: "true"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,26 +16,18 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: "pnpm"
-
       - name: Configure pnpm
         run: |
           pnpm config set registry https://registry.npmjs.org
           pnpm config set //registry.npmjs.org/:_authToken=${NPM_TOKEN}
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Prepare release
         run: pnpm semantic-release
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
       - name: Publish packages
         run: pnpm publish -r
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -27,15 +27,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Lint ${{ matrix.target }}
         run: pnpm lint:${{ matrix.target }}
 
@@ -59,20 +53,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Run tests
         run: pnpm --filter ${{ matrix.workspace }} test:ember
         env:
           COVERAGE: true
-
       - name: Upload coverage report to Codecov
         uses: codecov/codecov-action@v3
         with:
@@ -98,15 +85,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --no-lockfile
-
+          args: "--no-lockfile"
       - name: Run tests
         run: pnpm --filter ${{ matrix.workspace }} test:ember
 
@@ -124,27 +106,18 @@ jobs:
 
   #   steps:
   #     - uses: actions/checkout@v4
-  #     - uses: pnpm/action-setup@v2
-  #     - uses: actions/setup-node@v4
+  #     - uses: wyvox/action-setup-pnpm@v3
   #       with:
   #         node-version: ${{ env.NODE_VERSION }}
-  #         cache: "pnpm"
-
-  #     - name: Install dependencies
-  #       run: pnpm install
-
   #     - name: Connect to Browserstack
   #       run: pnpm ember browserstack:connect
-
   #     - name: Run tests
   #       run: pnpm test:browserstack
   #       env:
   #         CI_JOB_ID: ${{ job.container.id }}
   #         BROWSERSTACK_LOCAL_IDENTIFIER: ${{ job.container.id }}
-
   #     - name: Collect test results
   #       run: pnpm ember browserstack:results
-
   #     - name: Disconnect from Browserstack
   #       run: pnpm ember browserstack:disconnect
 
@@ -174,14 +147,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Run tests
-        run: pnpm --filter ${{ matrix.workspace }} ember try:one ${{ matrix.scenario }} --skip-cleanup
+        run: pnpm --filter ${{ matrix.workspace }} exec ember try:one ${{ matrix.scenario }} --skip-cleanup