Try switching from Pyodide patches to a submodule

Author: juntyr

.github/workflows/gh-pages.yml

@@ -12,57 +12,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v29
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Install the dependencies
         run: |
           python -m pip install -r requirements.txt
-      - name: Prepare Pyodide
-        run: |
-          git submodule init pyodide
-          git submodule update pyodide
-      - name: Check the Pyodide version
-        run: |
-          echo "PYODIDE_SHA_SHORT=$(git submodule status pyodide | cut -c 2-8)" >> $GITHUB_ENV
       - name: Cache the Pyodide build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ./pyodide
-          key: pyodide-${{ env.PYODIDE_SHA_SHORT }}-${{ hashFiles('patches/pyodide.patch') }}
-          restore-keys: |
-            pyodide-${{ env.PYODIDE_SHA_SHORT }}-${{ hashFiles('patches/pyodide.patch') }}
-            pyodide-${{ env.PYODIDE_SHA_SHORT }}
-      - name: Add a read-only SSH key to pull private dependencies
-        uses: webfactory/[email protected]
-        with:
-            ssh-private-key: ${{ secrets.FCBENCH_SSH_TOKEN }}
-      - name: Checkout and patch pyodide
-        run: |
-          cd pyodide
-          git apply --whitespace=nowarn ../patches/pyodide.patch
-          git clone [email protected]:juntyr/field-compression-benchmark.git \
-            packages/field-compression-benchmark/field-compression-benchmark
-          cd packages/field-compression-benchmark/field-compression-benchmark
-          git submodule update --init wasi/wit-deps/wasi-*
-          git apply ../patches/0001-codecs-build.patch
-      - name: Pre-build the wasm codecs for fcbench
-        run: |
-            cd pyodide/packages/field-compression-benchmark/field-compression-benchmark
-
-            # Build the codecs
-            cargo build -p codecs-build -vv
-
-            # Clean up after the build
-            cargo clean
-            grep '^channel\s*=\s*' rust-toolchain \
-              | sed 's/channel.*=.*\"\(.*\)\"/\1/' \
-              | xargs rustup toolchain uninstall
-            nix store gc
+          key: pyodide-${{ github.ref }}
+          restore-keys: pyodide-refs/heads/main
       - name: Build Pyodide and all required packages
         run: |
           cd pyodide
@@ -74,8 +41,6 @@ jobs:
       - name: Clean up the pyodide build
         run: |
           cd pyodide
-          git apply --whitespace=nowarn --reverse ../patches/pyodide.patch
-          rm -rf packages/field-compression-benchmark/field-compression-benchmark
           rm -rf .docker_home
           find . -name jupyter-lite.json -delete
           find . -name jupyter_lite_config.json -delete
@@ -94,7 +59,7 @@ jobs:
           find dist/ -name favicon.ico | xargs -L1 cp -f static/favicons/favicon.ico
           rm -rf static
       - name: Deploy to dist branch
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_branch: dist

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "pyodide"]
 	path = pyodide
-	url = https://github.com/pyodide/pyodide.git
+	url = https://github.com/climet-eu/pyodide.git