Fix GitHub Pages deployment - remove conflicting workflow and fix environment protection

Author: devnomadic

.github/workflows/deploy.yml

@@ -30,7 +30,8 @@ jobs:
         env:
           JEKYLL_ENV: production
 
-      - name: Upload artifact
+      - name: Upload artifact for main branch
+        if: github.ref == 'refs/heads/main'
         uses: actions/upload-pages-artifact@v3
         with:
           path: ./_site
@@ -52,24 +53,26 @@ jobs:
   preview:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-    needs: build
     steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+        
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          name: github-pages
-          path: ./preview-site
+          ruby-version: '3.1'
+          bundler-cache: true
 
-      - name: Extract site
-        run: |
-          cd preview-site
-          tar -xf artifact.tar
+      - name: Build PR site
+        run: bundle exec jekyll build
+        env:
+          JEKYLL_ENV: production
 
       - name: Deploy PR Preview
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./preview-site
+          publish_dir: ./_site
           destination_dir: pr-${{ github.event.number }}
 
       - name: Comment PR
@@ -82,16 +85,3 @@ jobs:
               repo: context.repo.repo,
               body: '🚀 Preview deployed to: https://devnomadic.com/pr-${{ github.event.number }}/'
             })
-
-  # Cleanup when PR is closed
-  cleanup:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cleanup preview
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .
-          destination_dir: pr-${{ github.event.number }}
-          exclude_assets: ''