[ change ] Replace WASM git submodules with cabal source-repository-package for network

Author: banacorn

.github/workflows/wasm.yaml

@@ -21,7 +21,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         path: als
-        submodules: true
 
     - name: Compute cache key
       run: echo "CI_CACHE_KEY=${{ runner.os }}-${{ runner.arch }}-${{ env.GHC_WASM_META_COMMIT_HASH }}-flavor-${{ env.GHC_WASM_META_FLAVOUR }}" >> "$GITHUB_ENV"
@@ -73,8 +72,11 @@ jobs:
       if: steps.ghc-wasm-setup.outcome == 'success' || steps.ghc-wasm-setup.outcome == 'skipped'
       run: wasm32-wasi-cabal update
 
-    - name: Install native utilities
+    - name: Install native utilities and autotools
       run: |
+        echo ">>> Install autotools for network package"
+        sudo apt-get update
+        sudo apt-get install -y autotools-dev autoconf
         echo ">>> Update cabal"
         ~/.ghc-wasm/cabal/bin/cabal update
         echo ">>> Install alex and happy"
@@ -109,11 +111,12 @@ jobs:
     - name: Build dependencies
       working-directory: './als'
       run: |
-        # Setup network submodule autotools
-        cd wasm-submodules/network
-        autoreconf -i
-        cd ../..
-        # Build all dependencies (cabal git deps + network submodule)
+        # Run autoreconf on network package source after cabal fetches it
+        echo ">>> Fetching dependencies first..."
+        wasm32-wasi-cabal fetch --dependencies-only
+        echo ">>> Running autoreconf on network package..."
+        find dist-newstyle/src -name "network-*" -type d | head -1 | xargs -I{} sh -c 'cd {} && autoreconf -i'
+        echo ">>> Building all dependencies..."
         wasm32-wasi-cabal build --dependencies-only
 
     - name: Build als

.gitmodules

@@ -1,10 +1,9 @@
 # How to build for WASM
 
 1. Setup a working ghc (tested with v9.10) with WASM backend and wasm32-wasi-cabal.
-2. `cd` into `wasm-submodules/network` and run `autoreconf -i`.
-3. In the project root, run `cp cabal.project{.wasm32,}`, and then `wasm32-wasi-cabal build`.
+2. In the project root, run `cp cabal.project{.wasm32,}`, and then `wasm32-wasi-cabal build`.
 
-Note: This project uses a hybrid approach - most dependencies use cabal's git handling, but the network package remains as a git submodule due to autotools requirements.
+Note: This project uses cabal's `source-repository-package` declarations to fetch git dependencies instead of git submodules.
 
 The process might output the following:
 

BUILDING_WASM.md

@@ -1,6 +1,5 @@
 packages:
   .
-  wasm-submodules/network
 
 source-repository-package
   type: git

cabal.project

@@ -1,6 +1,5 @@
 packages:
   .
-  wasm-submodules/network
 
 source-repository-package
   type: git
@@ -24,5 +23,10 @@ source-repository-package
   tag: 9baf76e6d9965a3b6e8b3ecfcdf33c62b5628fd8
   subdir: lsp-types
 
+source-repository-package
+  type: git
+  location: https://github.com/haskell-wasm/network.git
+  tag: 1dc870889eee4ac733335ced4e274b4dfe8ed369
+
 package Agda
   flags: +optimise-heavily