From e34fdb41df25b729164595d408e4727451eb153d Mon Sep 17 00:00:00 2001
From: Juniper Tyree <50025784+juntyr@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:24:57 +0000
Subject: [PATCH] Add explicit dist merge step

---
 .github/workflows/gh-pages.yml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index a0c77cb3..29590107 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -87,20 +87,32 @@ jobs:
           cp -r pyodide/dist static/pyodide
           rm -rf static/pyodide/*-tests.tar
           rm -f static/pyodide/tsconfig.tsbuildinfo
-          jupyter lite build --output-dir dist
-          cp ./_headers dist/
-          cp static/favicons/favicon.ico dist/
-          find dist/ -name favicon.ico | xargs -L1 cp -f static/favicons/favicon.ico
+          jupyter lite build --output-dir staging
+          cp ./_headers staging/
+          cp static/favicons/favicon.ico staging/
+          find staging/ -name favicon.ico | xargs -L1 cp -f static/favicons/favicon.ico
           rm -rf static
       - name: Get the current branch name
         uses: tj-actions/branch-names@v8
         id: branch
+      - name: Compute the current version name
+        run: echo "VERSION=${{ steps.branch.outputs.current_branch || steps.branch.outputs.tag }}" >> $GITHUB_ENV
+      - name: Checkout the previous dist branch
+        uses: actions/checkout@v4
+        with:
+          ref: dist
+          path: dist
+        continue-on-error: ${{ github.event_name != 'release' }}
+      - name: Merge the different dist versions
+        run: |
+          mkdir -p dist
+          rm -rf dist/${{ env.VERSION }}
+          mv staging dist/${{ env.VERSION }}
       - name: Deploy to dist branch
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_branch: dist
           publish_dir: ./dist
-          destination_dir: ${{ steps.branch.outputs.current_branch || steps.branch.outputs.tag }}
           keep_files: false
           force_orphan: true