update ci and clean guest-examples

Author: indirection42

.github/workflows/build.yml

@@ -120,26 +120,37 @@ jobs:
       - name: Run tests
         run: make test
 
-  # Build guest programs in parallel using matrix
-  build-guest:
+  # Generate guest program list dynamically
+  generate-guest-matrix:
     runs-on: ubuntu-latest
     # Run on main branches, release branches, or when explicitly requested
     if: |
       github.ref == 'refs/heads/master' ||
       startsWith(github.ref, 'refs/heads/release/') ||
       startsWith(github.ref, 'refs/tags/v') ||
       contains(github.event.pull_request.labels.*.name, 'full-build')
+    outputs:
+      guest-matrix: ${{ steps.generate-matrix.outputs.guest-matrix }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Generate guest matrix
+        id: generate-matrix
+        run: |
+          # Extract package names from Cargo.toml files
+          guests=$(find guest-examples -name "Cargo.toml" -not -path "guest-examples/Cargo.toml" | xargs -I{} sh -c 'grep "^name" "{}" | cut -d"=" -f2 | tr -d " \""' | jq -R -s -c 'split("\n")[:-1]')
+          echo "guest-matrix=$guests" >> $GITHUB_OUTPUT
+          echo "Found guest programs: $guests"
+
+  # Build guest programs in parallel using dynamic matrix
+  build-guest:
+    runs-on: ubuntu-latest
+    needs: generate-guest-matrix
     strategy:
       matrix:
-        guest: [
-          sum-balance,
-          sum-balance-hand-written,
-          sum-balance-percent,
-          swap-info,
-          total-supply,
-          total-supply-hand-written,
-          transparent-call-hand-written
-        ]
+        guest: ${{ fromJson(needs.generate-guest-matrix.outputs.guest-matrix) }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -153,7 +164,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-bin: "false"
-          prefix-key: "guest-${{ matrix.guest }}"
+          prefix-key: "${{ matrix.guest }}"
 
       - name: Install polkatool and pvq-program-metadata-gen
         run: |
@@ -177,7 +188,7 @@ jobs:
   # Collect all guest artifacts (optional - for when you need all guests together)
   collect-guests:
     runs-on: ubuntu-latest
-    needs: build-guest
+    needs: [generate-guest-matrix, build-guest]
     if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'full-build')
     steps:
       - name: Download all guest artifacts

Makefile

@@ -2,7 +2,7 @@
 run: chainspec
 	bunx @acala-network/chopsticks@1.0.6 --config poc/runtime/chopsticks.yml --genesis output/chainspec.json
 
-GUEST_EXAMPLES = $(shell find guest-examples -name "Cargo.toml" -not -path "guest-examples/Cargo.toml" | xargs -n1 dirname | xargs -n1 basename)
+GUEST_EXAMPLES = $(shell find guest-examples -name "Cargo.toml" -not -path "guest-examples/Cargo.toml" | xargs -I{} sh -c 'grep "^name" "{}" | cut -d"=" -f2 | tr -d " \""')
 GUEST_TARGETS = $(patsubst %,guest-%,$(GUEST_EXAMPLES))
 DUMMY_GUEST_TARGETS = $(patsubst %,dummy-guest-%,$(GUEST_EXAMPLES))
 
@@ -14,12 +14,12 @@ dummy-guests: $(DUMMY_GUEST_TARGETS)
 
 guest-%:
 	mkdir -p output
-	cd guest-examples; METADATA_OUTPUT_DIR=$(shell pwd)/output cargo build --release --bin guest-$* -p guest-$*
-	polkatool link --run-only-if-newer -s guest-examples/target/riscv32emac-unknown-none-polkavm/release/guest-$* -o output/guest-$*.polkavm
+	cd guest-examples; METADATA_OUTPUT_DIR=$(shell pwd)/output cargo build --release --bin $* -p $*
+	polkatool link --run-only-if-newer -s guest-examples/target/riscv32emac-unknown-none-polkavm/release/$* -o output/$*.polkavm
 
 dummy-guest-%:
 	mkdir -p output
-	touch output/guest-$*.polkavm
+	touch output/$*.polkavm
 
 .PHONY: tools
 tools: polkatool chain-spec-builder pvq-program-metadata-gen

guest-examples/Cargo.lock

@@ -1,13 +1,5 @@
 [workspace]
-members = [
-    "sum-balance",
-    "sum-balance-percent",
-    "sum-balance-hand-written",
-    "total-supply",
-    "total-supply-hand-written",
-    "transparent-call-hand-written",
-    "swap-info",
-]
+members = ["sum-balance", "sum-balance-percent", "total-supply", "swap-info"]
 resolver = "2"
 
 [workspace.dependencies]

guest-examples/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "guest-sum-balance-percent"
+name = "sum-balance-percent"
 version = "0.1.0"
 edition = "2021"
 publish = false

guest-examples/sum-balance-hand-written/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "guest-sum-balance"
+name = "sum-balance"
 version = "0.1.0"
 edition = "2021"
 publish = false

guest-examples/sum-balance-hand-written/src/main.rs

@@ -1,5 +1,5 @@
 [package]
-name = "guest-swap-info"
+name = "swap-info"
 version = "0.1.0"
 edition = "2021"
 publish = false