Switch pd to pnpm (podman-desktop#777)

* chore(test): switch pr check e2e test pd build to pnpm
cdrage · Sep 3, 2024 · 21b20e3 · 21b20e3
1 parent 92d239a
commit 21b20e3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 35 deletions.
diff --git a/.github/workflows/e2e-main.yaml b/.github/workflows/e2e-main.yaml
@@ -90,24 +90,19 @@ jobs:
           # allow unprivileged user namespace
           sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
-      - name: Build Podman Desktop for E2E tests
-        working-directory: ./podman-desktop
-        run: |
-          yarn --frozen-lockfile
-          yarn test:e2e:build
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          run_install: false
+          package_json_file: ./podman-desktop/package.json
 
-      - name: Get yarn cache directory path
-        working-directory: ./podman-desktop-extension-bootc
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT}
+      - name: Execute pnpm
+        working-directory: ./podman-desktop
+        run: pnpm install
 
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+      - name: Build Podman Desktop for E2E tests
+        working-directory: ./podman-desktop
+        run: pnpm test:e2e:build
 
       - name: Ensure getting current HEAD version of the test framework
         working-directory: ./podman-desktop-extension-bootc/tests/playwright

diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
@@ -128,24 +128,19 @@ jobs:
           # allow unprivileged user namespace
           sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
-      - name: Build Podman Desktop for E2E tests
-        working-directory: ./podman-desktop
-        run: |
-          yarn --frozen-lockfile
-          yarn test:e2e:build
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          run_install: false
+          package_json_file: ./podman-desktop/package.json
 
-      - name: Get yarn cache directory path
-        working-directory: ./podman-desktop-extension-bootc
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> ${GITHUB_OUTPUT}
+      - name: Execute pnpm
+        working-directory: ./podman-desktop
+        run: pnpm install
 
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+      - name: Build Podman Desktop for E2E tests
+        working-directory: ./podman-desktop
+        run: pnpm test:e2e:build
 
       - name: Ensure getting current HEAD version of the test framework
         working-directory: ./podman-desktop-extension-bootc/tests/playwright

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   "resolutions": {
     "string-width": "^4.2.0",
     "wrap-ansi": "^7.0.0"
-},
+  },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.0.1",

diff --git a/tests/playwright/vitest.config.js b/tests/playwright/vitest.config.js
@@ -19,8 +19,6 @@
 const config = {
   test: {
     globals: true,
-    globalSetup: '../../node_modules/@podman-desktop/tests-playwright/src/globalSetup/global-setup.ts',
-    setupFiles: './src/setupFiles/extended-hooks.ts',
     /**
      * By default, vitest search test files in all packages.
      * For e2e tests have sense search only is project root tests folder