From 3b6fe56549665f83947e0386755a3fa9fa9cbae3 Mon Sep 17 00:00:00 2001
From: mgabor <9047995+mgabor3141@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:34:13 +0200
Subject: [PATCH] update deploy workflow

---
 .github/workflows/deploy.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0ac658f..f4a243e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Deploy Next.js site to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ['master', 'feat/v2']
+    branches: ['main', 'feat/v2']
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -75,12 +75,14 @@ jobs:
         run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
       - name: Build with Next.js
         run: ${{ steps.detect-package-manager.outputs.runner }} next build
-      # Checkout v1 into a folder inside the build output
-      - name: Checkout release/v1 branch into v1_src directory
+      - name: Checkout release/v1 branch into v1_root directory
         uses: actions/checkout@v4
         with:
           ref: release/v1
-          path: ./out/v1
+          path: v1_root
+      - name: Copy v1 folder into v2 build output
+        run: |
+          cp -r ./v1_root/v1/ ./out/
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with: