From f7b2e85ddcf125a5e36a3712682e42289d962ecf Mon Sep 17 00:00:00 2001
From: alimpens <a.limpens@amsterdam.nl>
Date: Wed, 30 Oct 2024 15:48:25 +0100
Subject: [PATCH] chore: Fix feature branch cleanup workflow

---
 .github/workflows/feature-branch-cleanup.yml | 9 ++++++---
 .github/workflows/feature-branch-deploy.yml  | 5 -----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/feature-branch-cleanup.yml b/.github/workflows/feature-branch-cleanup.yml
index 6d5193c7bc..2820ae60fb 100644
--- a/.github/workflows/feature-branch-cleanup.yml
+++ b/.github/workflows/feature-branch-cleanup.yml
@@ -19,15 +19,18 @@ jobs:
           BRANCH_NAME=$(echo $RAW_BRANCH_NAME | sed 's/[^/]*\///')
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
 
-      - name: Check out
+      - name: Check out branch to access .nvmrc
         uses: actions/checkout@v4
-        with:
-          ref: gh-pages
 
       - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
 
+      - name: Check out gh-pages branch
+        uses: actions/checkout@v4
+        with:
+          ref: gh-pages
+
       - name: Delete folder
         run: |
           git config --global user.name GitHub Action
diff --git a/.github/workflows/feature-branch-deploy.yml b/.github/workflows/feature-branch-deploy.yml
index 8b416e34a4..da182dd53a 100644
--- a/.github/workflows/feature-branch-deploy.yml
+++ b/.github/workflows/feature-branch-deploy.yml
@@ -54,11 +54,6 @@ jobs:
         run: |
           touch ./storybook/dist/${{ github.sha }}.txt
 
-      # Our workflows use .nvmrc instead of a fixed version, so we need to copy this file over
-      # to the dist files for use in the feature branch cleanup workflow
-      - name: Copy over .nvmrc to dist
-        run: cp .nvmrc ./storybook/dist/
-
       - name: Pushing to pages branch
         uses: JamesIves/github-pages-deploy-action@v4
         with: