From 88fff49f09ac89bf88672b7213ff042cb363c6bc Mon Sep 17 00:00:00 2001 From: Fritz Hoeing Date: Mon, 17 Jun 2024 17:35:49 +0200 Subject: [PATCH 01/14] ci: make use of github actions --- .github/actions/pre_test_setup.yml | 50 +++ .github/workflows/acceptance.yml | 468 ++--------------------------- 2 files changed, 74 insertions(+), 444 deletions(-) create mode 100644 .github/actions/pre_test_setup.yml diff --git a/.github/actions/pre_test_setup.yml b/.github/actions/pre_test_setup.yml new file mode 100644 index 0000000000..5bea67706d --- /dev/null +++ b/.github/actions/pre_test_setup.yml @@ -0,0 +1,50 @@ +name: pre test Setup + +runs: + using: 'composite' + +permissions: + contents: write + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + # node setup + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + + - name: Enable corepack + run: corepack enable + + - name: Get pnpm store directory + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + + - uses: actions/cache@v4 + name: Setup pnpm cache + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + + - name: Cache Cypress Binary + id: cache-cypress-binary + uses: actions/cache@v4 + with: + path: ~/.cache/Cypress + key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} + + - run: pnpm i + + - name: Install Cypress if not in cache + if: steps.cache-cypress-binary.outputs.cache-hit != 'true' + working-directory: packages/volto + run: make cypress-install diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index aaba6f2349..151fa8a422 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -11,43 +11,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -90,43 +55,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -169,43 +99,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -248,43 +143,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -327,43 +187,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -406,43 +231,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -484,43 +274,8 @@ jobs: matrix: node-version: [18.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -563,43 +318,8 @@ jobs: matrix: node-version: [18.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress Coresandbox Acceptance tests uses: cypress-io/github-action@v6 @@ -710,43 +430,8 @@ jobs: matrix: node-version: [18.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -790,43 +475,8 @@ jobs: node-version: [18.x] # python-version: [3.7] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml # # python setup (temporary, while p.a.iterate changes are in a PR) # - name: Set up Python ${{ matrix.python-version }} @@ -1035,43 +685,8 @@ jobs: matrix: node-version: [18.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -1116,43 +731,8 @@ jobs: matrix: node-version: [18.x] steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + - name: Pretest-Setup + uses: ./.github/actions/pre_test_setup.yml - name: Cypress acceptance tests uses: cypress-io/github-action@v6 From fcd221e98bf8b2329ed7f583c25ffaeacbb42614 Mon Sep 17 00:00:00 2001 From: Fritz Hoeing Date: Wed, 19 Jun 2024 16:43:11 +0200 Subject: [PATCH 02/14] feat: add changelog entry --- packages/volto/news/6108.internal | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/volto/news/6108.internal diff --git a/packages/volto/news/6108.internal b/packages/volto/news/6108.internal new file mode 100644 index 0000000000..d18b52c86c --- /dev/null +++ b/packages/volto/news/6108.internal @@ -0,0 +1 @@ +Improvement of the existing github-workflow by encapsulating a common operation into a reusable action for easier maintenance @FritzHoing From 0236fcd573e49242e8d1cff6d555aa25fc9fb72f Mon Sep 17 00:00:00 2001 From: Fritz Hoeing Date: Thu, 20 Jun 2024 09:28:15 +0200 Subject: [PATCH 03/14] fix: add mising actions checkout --- .github/workflows/acceptance.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 151fa8a422..82c6b8b57e 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -11,6 +11,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup.yml From 7bdb0c6675db0657451c1d6afb119dc0ed539f57 Mon Sep 17 00:00:00 2001 From: Fritz Hoeing Date: Thu, 20 Jun 2024 09:41:52 +0200 Subject: [PATCH 04/14] ci: rename action --- .../action.yml} | 0 .github/workflows/acceptance.yml | 24 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) rename .github/actions/{pre_test_setup.yml => pre_test_setup/action.yml} (100%) diff --git a/.github/actions/pre_test_setup.yml b/.github/actions/pre_test_setup/action.yml similarity index 100% rename from .github/actions/pre_test_setup.yml rename to .github/actions/pre_test_setup/action.yml diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 82c6b8b57e..d9339efa52 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -58,7 +58,7 @@ jobs: node-version: [18.x, 20.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -102,7 +102,7 @@ jobs: node-version: [18.x, 20.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -146,7 +146,7 @@ jobs: node-version: [18.x, 20.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -190,7 +190,7 @@ jobs: node-version: [18.x, 20.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -234,7 +234,7 @@ jobs: node-version: [18.x, 20.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -277,7 +277,7 @@ jobs: node-version: [18.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -321,7 +321,7 @@ jobs: node-version: [18.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress Coresandbox Acceptance tests uses: cypress-io/github-action@v6 @@ -433,7 +433,7 @@ jobs: node-version: [18.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -478,7 +478,7 @@ jobs: # python-version: [3.7] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup # # python setup (temporary, while p.a.iterate changes are in a PR) # - name: Set up Python ${{ matrix.python-version }} @@ -688,7 +688,7 @@ jobs: node-version: [18.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -734,7 +734,7 @@ jobs: node-version: [18.x] steps: - name: Pretest-Setup - uses: ./.github/actions/pre_test_setup.yml + uses: ./.github/actions/pre_test_setup - name: Cypress acceptance tests uses: cypress-io/github-action@v6 From d744c6d914d7ea44d296bc96932b7b1df204d58d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 20 Jun 2024 01:59:28 -0700 Subject: [PATCH 05/14] Update packages/volto/news/6108.internal --- packages/volto/news/6108.internal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/volto/news/6108.internal b/packages/volto/news/6108.internal index d18b52c86c..cbb99aad6a 100644 --- a/packages/volto/news/6108.internal +++ b/packages/volto/news/6108.internal @@ -1 +1 @@ -Improvement of the existing github-workflow 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 From 2ffdf2e1393302e0e3ed74c0add4ae20628ad225 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Sun, 23 Jun 2024 09:44:30 +0300 Subject: [PATCH 06/14] fix import and usage of pre_test_setup/action.yml template within acceptance tests --- .github/actions/pre_test_setup/action.yml | 93 +++++++++++------------ .github/workflows/acceptance.yml | 46 +++++++++++ 2 files changed, 92 insertions(+), 47 deletions(-) diff --git a/.github/actions/pre_test_setup/action.yml b/.github/actions/pre_test_setup/action.yml index 5bea67706d..b49310b6b7 100644 --- a/.github/actions/pre_test_setup/action.yml +++ b/.github/actions/pre_test_setup/action.yml @@ -1,50 +1,49 @@ name: pre test Setup runs: - using: 'composite' - -permissions: - contents: write - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - # node setup - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - - name: Enable corepack - run: corepack enable - - - name: Get pnpm store directory - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - - uses: actions/cache@v4 - name: Setup pnpm cache - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- - - - name: Cache Cypress Binary - id: cache-cypress-binary - uses: actions/cache@v4 - with: - path: ~/.cache/Cypress - key: binary-${{ matrix.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - - - run: pnpm i - - - name: Install Cypress if not in cache - if: steps.cache-cypress-binary.outputs.cache-hit != 'true' - working-directory: packages/volto - run: make cypress-install + using: "composite" + steps: + - uses: actions/checkout@v4 + + - name: Use Node.js ${{ inputs.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ inputs.node-version }} + + - name: Enable corepack + shell: bash + run: corepack enable + + - name: Get pnpm store directory + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + + - uses: actions/cache@v4 + name: Setup pnpm cache + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + + - name: Install dependencies + shell: bash + run: pnpm i + + - name: Cache Cypress Binary + uses: actions/cache@v4 + with: + path: ~/.cache/Cypress + key: binary-${{ inputs.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} + + - 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 + +inputs: + node-version: + description: 'Node.js version' + required: true diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index d9339efa52..dbdb71b002 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -15,6 +15,8 @@ jobs: - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -57,8 +59,12 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -101,8 +107,12 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -145,8 +155,12 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -189,8 +203,12 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -233,8 +251,12 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -276,8 +298,12 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -320,8 +346,12 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress Coresandbox Acceptance tests uses: cypress-io/github-action@v6 @@ -432,8 +462,12 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -477,8 +511,12 @@ jobs: node-version: [18.x] # python-version: [3.7] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} # # python setup (temporary, while p.a.iterate changes are in a PR) # - name: Set up Python ${{ matrix.python-version }} @@ -687,8 +725,12 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 @@ -733,8 +775,12 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Pretest-Setup uses: ./.github/actions/pre_test_setup + with: + node-version: ${{ matrix.node-version }} - name: Cypress acceptance tests uses: cypress-io/github-action@v6 From f04c7419d0e7b85f907b9c1ef7ccdebe3a662da9 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Sun, 23 Jun 2024 15:20:03 +0300 Subject: [PATCH 07/14] 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 From 4ee93787eb89e5cb7590110860ee566d6d2e43cc Mon Sep 17 00:00:00 2001 From: David Ichim Date: Sun, 23 Jun 2024 15:23:53 +0300 Subject: [PATCH 08/14] Re-add actions/checkout before testing infrastructure, without it actions crash --- .github/workflows/acceptance.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 7d7fa93fb8..cd7e3aaa8b 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -11,6 +11,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -57,6 +59,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -103,6 +107,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -149,6 +155,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -195,6 +203,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -241,6 +251,8 @@ jobs: matrix: node-version: [18.x, 20.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -286,6 +298,8 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -332,6 +346,8 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -446,6 +462,8 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -493,6 +511,8 @@ jobs: node-version: [18.x] # python-version: [3.7] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -705,6 +725,8 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: @@ -753,6 +775,8 @@ jobs: matrix: node-version: [18.x] steps: + - uses: actions/checkout@v4 + - name: Set up testing infrastructure uses: ./.github/actions/pre_test_setup with: From cb97cc91f4e3fe8144aa01a4e7c02943463d0f42 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Sun, 23 Jun 2024 15:30:57 +0300 Subject: [PATCH 09/14] Added back shell: bash as github actions complains about missing shell option --- .github/actions/pre_test_setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/pre_test_setup/action.yml b/.github/actions/pre_test_setup/action.yml index a1e398a544..8ff7cf587a 100644 --- a/.github/actions/pre_test_setup/action.yml +++ b/.github/actions/pre_test_setup/action.yml @@ -38,6 +38,7 @@ runs: - 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 From ac2c186b55271b4590da8843ffc282cfae615e9d Mon Sep 17 00:00:00 2001 From: David Ichim Date: Sun, 23 Jun 2024 15:35:13 +0300 Subject: [PATCH 10/14] Re-added shell:bash to install Volto dependencies, actions complain and crash without it --- .github/actions/pre_test_setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/pre_test_setup/action.yml b/.github/actions/pre_test_setup/action.yml index 8ff7cf587a..278f53d4d4 100644 --- a/.github/actions/pre_test_setup/action.yml +++ b/.github/actions/pre_test_setup/action.yml @@ -34,6 +34,7 @@ runs: key: binary-${{ inputs.node-version }}-${{ hashFiles('pnpm-lock.yaml') }} - name: Install Volto dependencies + shell: bash run: pnpm i - name: Install Cypress if not in cache From 938ec5afc0911237147c49373530b8795e3118f1 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Sun, 23 Jun 2024 15:37:35 +0300 Subject: [PATCH 11/14] Re-added shell:bash to Enable corepack, actions complain and crash without it --- .github/actions/pre_test_setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/pre_test_setup/action.yml b/.github/actions/pre_test_setup/action.yml index 278f53d4d4..cdefd3dea3 100644 --- a/.github/actions/pre_test_setup/action.yml +++ b/.github/actions/pre_test_setup/action.yml @@ -11,6 +11,7 @@ runs: node-version: ${{ inputs.node-version }} - name: Enable corepack + shell: bash run: corepack enable - name: Get pnpm store directory From 161b7b8831310afbfe73877695181c18d229c5e5 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Wed, 26 Jun 2024 13:16:10 +0300 Subject: [PATCH 12/14] Renamed action and name according to pull request feedback --- .../action.yml | 2 +- .github/workflows/acceptance.yml | 48 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) rename .github/actions/{pre_test_setup => node_env_setup}/action.yml (97%) diff --git a/.github/actions/pre_test_setup/action.yml b/.github/actions/node_env_setup/action.yml similarity index 97% rename from .github/actions/pre_test_setup/action.yml rename to .github/actions/node_env_setup/action.yml index cdefd3dea3..8612ccdb06 100644 --- a/.github/actions/pre_test_setup/action.yml +++ b/.github/actions/node_env_setup/action.yml @@ -1,4 +1,4 @@ -name: Set up testing infrastructure +name: Set up NodeJS environment runs: using: "composite" diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 4e03b0ee7d..6cc4ecdf3c 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -13,8 +13,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -61,8 +61,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -109,8 +109,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -157,8 +157,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -205,8 +205,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -253,8 +253,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -300,8 +300,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -348,8 +348,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -396,8 +396,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -445,8 +445,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -635,8 +635,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -685,8 +685,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up testing infrastructure - uses: ./.github/actions/pre_test_setup + - name: Set up NodeJS environment + uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} From 136c9b19fa01f7eb9948be6463d36ca32d86a084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Wed, 26 Jun 2024 12:51:20 +0200 Subject: [PATCH 13/14] Update .github/actions/node_env_setup/action.yml Co-authored-by: Steve Piercy --- .github/actions/node_env_setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/node_env_setup/action.yml b/.github/actions/node_env_setup/action.yml index 8612ccdb06..b058a41457 100644 --- a/.github/actions/node_env_setup/action.yml +++ b/.github/actions/node_env_setup/action.yml @@ -1,4 +1,4 @@ -name: Set up NodeJS environment +name: Set up Node.js environment runs: using: "composite" From a5d2a653a614b9c2b56c560c7820b51cb35351b0 Mon Sep 17 00:00:00 2001 From: David Ichim Date: Wed, 26 Jun 2024 14:18:38 +0300 Subject: [PATCH 14/14] Use Node.js naming --- .github/workflows/acceptance.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 6cc4ecdf3c..af5967f394 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -109,7 +109,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -157,7 +157,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -205,7 +205,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -253,7 +253,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -300,7 +300,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -348,7 +348,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -396,7 +396,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -445,7 +445,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -635,7 +635,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }} @@ -685,7 +685,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up NodeJS environment + - name: Set up Node.js environment uses: ./.github/actions/node_env_setup with: node-version: ${{ matrix.node-version }}