From f04c7419d0e7b85f907b9c1ef7ccdebe3a662da9 Mon Sep 17 00:00:00 2001
From: David Ichim <ichim.david@gmail.com>
Date: Sun, 23 Jun 2024 15:20:03 +0300
Subject: [PATCH] Removed uneeded change of pnpm install position and improved
 name of testing setup

---
 .github/actions/pre_test_setup/action.yml | 12 +++---
 .github/workflows/acceptance.yml          | 48 ++++++-----------------
 packages/volto/news/6108.internal         |  2 +-
 3 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/.github/actions/pre_test_setup/action.yml b/.github/actions/pre_test_setup/action.yml
index b49310b6b7..a1e398a544 100644
--- a/.github/actions/pre_test_setup/action.yml
+++ b/.github/actions/pre_test_setup/action.yml
@@ -1,4 +1,4 @@
-name: pre test Setup
+name: Set up testing infrastructure 
 
 runs:
   using: "composite"
@@ -11,7 +11,6 @@ runs:
         node-version: ${{ inputs.node-version }}
 
     - name: Enable corepack
-      shell: bash
       run: corepack enable
 
     - name: Get pnpm store directory
@@ -27,19 +26,18 @@ runs:
         restore-keys: |
           ${{ runner.os }}-pnpm-store-
 
-    - name: Install dependencies
-      shell: bash
-      run: pnpm i
-
     - name: Cache Cypress Binary
+      id: cache-cypress-binary
       uses: actions/cache@v4
       with:
         path: ~/.cache/Cypress
         key: binary-${{ inputs.node-version }}-${{ hashFiles('pnpm-lock.yaml') }}
 
+    - name: Install Volto dependencies
+      run: pnpm i
+
     - name: Install Cypress if not in cache
       if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
-      shell: bash
       working-directory: packages/volto
       run: make cypress-install
 
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index dbdb71b002..7d7fa93fb8 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -11,9 +11,7 @@ jobs:
       matrix:
         node-version: [18.x, 20.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -59,9 +57,7 @@ jobs:
       matrix:
         node-version: [18.x, 20.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -107,9 +103,7 @@ jobs:
       matrix:
         node-version: [18.x, 20.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -155,9 +149,7 @@ jobs:
       matrix:
         node-version: [18.x, 20.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -203,9 +195,7 @@ jobs:
       matrix:
         node-version: [18.x, 20.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -251,9 +241,7 @@ jobs:
       matrix:
         node-version: [18.x, 20.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -298,9 +286,7 @@ jobs:
       matrix:
         node-version: [18.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -346,9 +332,7 @@ jobs:
       matrix:
         node-version: [18.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -462,9 +446,7 @@ jobs:
       matrix:
         node-version: [18.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -511,9 +493,7 @@ jobs:
         node-version: [18.x]
         # python-version: [3.7]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -725,9 +705,7 @@ jobs:
       matrix:
         node-version: [18.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
@@ -775,9 +753,7 @@ jobs:
       matrix:
         node-version: [18.x]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Pretest-Setup
+      - name: Set up testing infrastructure
         uses: ./.github/actions/pre_test_setup
         with:
           node-version: ${{ matrix.node-version }}
diff --git a/packages/volto/news/6108.internal b/packages/volto/news/6108.internal
index cbb99aad6a..d196847f84 100644
--- a/packages/volto/news/6108.internal
+++ b/packages/volto/news/6108.internal
@@ -1 +1 @@
-Improved the existing GitHub workflows by encapsulating a common operation into a reusable action for easier maintenance. @FritzHoing
+Improved the existing GitHub workflows by encapsulating a common operation into a reusable action for easier maintenance. @FritzHoing, @ichim-david