Dev

.github/workflows/ci.yml

@@ -36,20 +36,14 @@ jobs:
           git config --local user.email "github-actions@github.com"
           git config --local user.name "GitHub Actions"
 
-      - name: 'Resolve merge conflicts if any'
-        run: |
-          git checkout main
-          git fetch origin
-          git reset --hard origin/main  
-
       - name: 'Copy build artifacts to gh-pages branch'
         run: |
           mkdir /tmp/temp-directory
-          cp -r .next/* /tmp/temp-directory/
+          cp -r build/* /tmp/temp-directory/
           git checkout gh-pages
-          git rm -rf .
-          cp -r /tmp/temp-directory/ .
-          git add temp-directory/ 
+          rm -rf *
+          cp -r /tmp/temp-directory/* .
+          git add . 
           git commit -m "Copy build artifacts from main to gh-pages branch"
 
       - name: Push to gh-pages

next.config.js

@@ -18,7 +18,7 @@ module.exports = (phase, { defaultConfig }) => {
         unoptimized: true,
       },
       output: "export",
-      distDir: "docs"
+      distDir: "build"
     };
   }
 

package.json

@@ -4,10 +4,10 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build && touch ./docs/.nojekyll",
+    "build": "next build && touch ./build/.nojekyll",
     "start": "next start",
     "lint": "next lint",
-    "start:build": "serve ./docs",
+    "start:build": "serve ./build",
     "prepare": "husky install",
     "check-types": "tsc --pretty --noEmit",
     "check-format": "npx prettier --check .",