Use pnpm in CI

tildeio · Jul 26, 2023 · 73483c3 · 73483c3
1 parent b650d06
commit 73483c3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,29 +22,25 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Volta
-        uses: volta-cli/action@v3
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+      - name: Setup
+        uses: wyvox/action@v1
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Run Tests
-        run: yarn workspace test-app run test:ember
+        run: pnpm test
 
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Volta
-        uses: volta-cli/action@v3
-      - name: Install Dependencies
-        run: yarn install --no-lockfile
+      - name: Setup
+        uses: wyvox/action@v1
+        with:
+          pnpm-args: --no-frozen-lockfile
       - name: Run Tests
-        run: yarn workspace test-app run test:ember
+        run: pnpm test
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -70,13 +66,10 @@ jobs:
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Volta
-        uses: volta-cli/action@v3
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-      - name: Run Tests
-        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
+      - name: Setup
+        uses: wyvox/action@v1
+      - name: Try Scenario
+        run: pnpm exec ember try:one ${{ matrix.try-scenario }} --skip-cleanup
         working-directory: test-app
 
   publish:
@@ -85,16 +78,14 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Volta
-        uses: volta-cli/action@v3
+      - name: Setup
+        uses: wyvox/action@v1
       - name: Set up npm
         run: |
           echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}"> ~/.npmrc
           npm whoami
         env:
           NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
       - name: Publish to npm
-        run: npm publish
+        run: pnpm publish
         working-directory: ember-element-helper
diff --git a/test-app/package.json b/test-app/package.json
@@ -19,9 +19,7 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "concurrently 'npm:lint' 'npm:test:*' --names 'lint,test:'",
-    "test:ember-compatibility": "ember try:each",
-    "test:ember": "ember test"
+    "test": "ember test"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.21.3",