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

Author: banacorn

.github/workflows/wasm.yaml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         path: als
-        submodules: recursive
+        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"
@@ -106,12 +106,14 @@ jobs:
         path: als/dist-newstyle
         key: dist-newstyle-${{ env.CI_CACHE_KEY }}-${{ hashFiles('als/dist-newstyle/**') }}
 
-    - name: Build every dependency else
+    - 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)
         wasm32-wasi-cabal build --dependencies-only
 
     - name: Build als

.gitmodules

@@ -1,16 +1,4 @@
-[submodule "wasm-submodules/agda"]
-	path = wasm-submodules/agda
-    url = [email protected]:agda-web/agda.git
-[submodule "wasm-submodules/foundation"]
-	path = wasm-submodules/foundation
-	url = [email protected]:haskell-wasm/foundation.git
 [submodule "wasm-submodules/network"]
 	path = wasm-submodules/network
 	url = https://github.com/haskell-wasm/network
-[submodule "wasm-submodules/network-simple-0.4.2"]
-	path = wasm-submodules/network-simple-0.4.2
-	url = https://github.com/k0001/network-simple
-[submodule "wasm-submodules/lsp"]
-	path = wasm-submodules/lsp
-	url = [email protected]:agda-web/lsp.git
 

BUILDING_WASM.md

@@ -4,6 +4,8 @@
 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`.
 
+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.
+
 The process might output the following:
 
 ```

cabal.project

@@ -0,0 +1,28 @@
+packages:
+  .
+  wasm-submodules/network
+
+source-repository-package
+  type: git
+  location: https://github.com/agda-web/agda.git
+  tag: 87cac9ce17932321dc1a0fdaed83436de22fa0aa
+
+source-repository-package
+  type: git  
+  location: https://github.com/haskell-wasm/foundation.git
+  tag: 8e6dd48527fb429c1922083a5030ef88e3d58dd3
+  subdir: basement
+
+source-repository-package
+  type: git
+  location: https://github.com/k0001/network-simple.git
+  tag: 2c3ab6e7aa2a86be692c55bf6081161d83d50c34
+
+source-repository-package
+  type: git
+  location: https://github.com/agda-web/lsp.git
+  tag: 9baf76e6d9965a3b6e8b3ecfcdf33c62b5628fd8
+  subdir: lsp-types
+
+package Agda
+  flags: +optimise-heavily

cabal.project.wasm32

@@ -1,10 +1,28 @@
 packages:
   .
-  wasm-submodules/agda
-  wasm-submodules/foundation/basement
   wasm-submodules/network
-  wasm-submodules/network-simple-0.4.2
-  wasm-submodules/lsp/lsp-types
+
+source-repository-package
+  type: git
+  location: https://github.com/agda-web/agda.git
+  tag: 87cac9ce17932321dc1a0fdaed83436de22fa0aa
+
+source-repository-package
+  type: git  
+  location: https://github.com/haskell-wasm/foundation.git
+  tag: 8e6dd48527fb429c1922083a5030ef88e3d58dd3
+  subdir: basement
+
+source-repository-package
+  type: git
+  location: https://github.com/k0001/network-simple.git
+  tag: 2c3ab6e7aa2a86be692c55bf6081161d83d50c34
+
+source-repository-package
+  type: git
+  location: https://github.com/agda-web/lsp.git
+  tag: 9baf76e6d9965a3b6e8b3ecfcdf33c62b5628fd8
+  subdir: lsp-types
 
 package Agda
   flags: +optimise-heavily