From 05dda2eb29490f4aaf8972e42f90a8d462a54bd1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 19 Sep 2026 13:58:49 +0000
Subject: [PATCH] Fix website checkout and snap build context

Co-authored-by: dichhead <330471626+dichhead@users.noreply.github.com>
---
 .github/workflows/pages.yml   | 12 ++++++------
 .github/workflows/release.yml |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 3ec0c62b6..f5005767f 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -99,12 +99,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: main
-          path: website
+          path: website-source
 
       - name: Validate website
         run: |
           SCRIPT=$(cat <<'EOF'
-          cd "$GITHUB_WORKSPACE/website"
+          cd "$GITHUB_WORKSPACE/website-source"
           python3 scripts/test_site.py
           EOF
           )
@@ -113,8 +113,8 @@ jobs:
       - name: Assemble landing page
         run: |
           SCRIPT=$(cat <<'EOF'
-          cd "$GITHUB_WORKSPACE/website"
-          sh "$GITHUB_WORKSPACE/website/scripts/assemble-site.sh" "$GITHUB_WORKSPACE/dist"
+          cd "$GITHUB_WORKSPACE/website-source"
+          sh "$GITHUB_WORKSPACE/website-source/scripts/assemble-site.sh" "$GITHUB_WORKSPACE/dist"
           EOF
           )
           nix develop --command bash --noprofile --norc -euo pipefail -c "$SCRIPT"
@@ -122,7 +122,7 @@ jobs:
       - name: Record website source
         run: |
           SCRIPT=$(cat <<'EOF'
-          cd "$GITHUB_WORKSPACE/website"
+          cd "$GITHUB_WORKSPACE/website-source"
           git rev-parse HEAD > "$GITHUB_WORKSPACE/dist/site-version.txt"
           EOF
           )
@@ -270,7 +270,7 @@ jobs:
       - name: Generate project growth charts
         env:
           GITHUB_TOKEN: ${{ secrets.OCS_GITHUB_TOKEN }}
-        run: nix develop --command python3 website/scripts/generate-star-history.py --output-dir dist
+        run: nix develop --command python3 website-source/scripts/generate-star-history.py --output-dir dist
 
       # Browsers cannot reliably fetch YouTube playlist/oEmbed responses because
       # of CORS. Build a same-origin listing and thumbnail directory for the
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ac0b5639..cbfd40f76 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -163,8 +163,13 @@ jobs:
           test -n "$VERSION"
           rm -rf .snap-build
           mkdir -p .snap-build
-          cp linux-payload.tar.gz .snap-build/
-          cp -R snap .snap-build/
+          shopt -s dotglob
+          for entry in * .*; do
+            case "$entry" in
+              .|..|.git|.snap-build) continue ;;
+            esac
+            cp -a "$entry" .snap-build/
+          done
           sed -i "s/^version: .*/version: '$VERSION'/" .snap-build/snap/snapcraft.yaml
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           EOF