From aab6cde81ec733273dde8057029745c15f323b95 Mon Sep 17 00:00:00 2001 From: "manuel.carrera" Date: Wed, 6 Nov 2024 17:51:33 -0700 Subject: [PATCH 1/4] fix: Remove start server command from forward merge action --- .github/workflows/forward-merge.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/forward-merge.yml b/.github/workflows/forward-merge.yml index b967243290..9f413e0c98 100644 --- a/.github/workflows/forward-merge.yml +++ b/.github/workflows/forward-merge.yml @@ -146,9 +146,6 @@ jobs: # ignoreLastBuildOnBranch: ${{ needs.get-branch-names.outputs.next-branch }} # debug: true - - name: Start Server - run: npx http-server docs -p 9001 & npx wait-on http://localhost:9001 - - name: Integration tests run: yarn cypress run --component --record --parallel --env skip_storybook_test=true # skip the Storybook test during forward merges env: From 8f08ee643afb610868657ea263ad5901d86fa946 Mon Sep 17 00:00:00 2001 From: "manuel.carrera" Date: Thu, 7 Nov 2024 12:23:39 -0700 Subject: [PATCH 2/4] fix: Remove storybook comment and skip storybook test --- .github/workflows/forward-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/forward-merge.yml b/.github/workflows/forward-merge.yml index 9f413e0c98..97c371d4bd 100644 --- a/.github/workflows/forward-merge.yml +++ b/.github/workflows/forward-merge.yml @@ -147,7 +147,7 @@ jobs: # debug: true - name: Integration tests - run: yarn cypress run --component --record --parallel --env skip_storybook_test=true # skip the Storybook test during forward merges + run: yarn cypress run --component --record --parallel env: # Github Actions doesn't support encryption on forks # If these keys become compromised, we will rotate and disable these features From f0034fe3913c46b7f7b6a8b2e7ca7287c9225f8c Mon Sep 17 00:00:00 2001 From: "manuel.carrera" Date: Thu, 7 Nov 2024 12:26:28 -0700 Subject: [PATCH 3/4] fix: Update node nvmrc --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index fac0b0a839..7eae4e2e91 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.20.0 +18.0.0 From 0442ba44420058e948df6c33af2ecc5cb6b4ce4d Mon Sep 17 00:00:00 2001 From: Manuel Carrera Date: Thu, 7 Nov 2024 14:09:51 -0700 Subject: [PATCH 4/4] Update .nvmrc --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 7eae4e2e91..fac0b0a839 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.0.0 +16.20.0