Merge branch 'main' of github.com:Lind-Project/lind-wasm into encode-argid

Author: stupendoussuperpowers

.github/workflows/dev.yml

@@ -8,6 +8,7 @@ permissions: {}
 jobs:
   docker:
     runs-on: ubuntu-22.04
+    environment: dockerhub
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
@@ -16,14 +17,14 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       # Configure Docker release tags:
       # - securesystemslab/lind-wasm-dev:sha-<short commit id>
       # - securesystemslab/lind-wasm-dev:latest
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
         with:
           images: |
             securesystemslab/lind-wasm-dev
@@ -34,7 +35,7 @@ jobs:
 
       # Single-step: Build and push Dockerfile.dev
       - name: Build and push
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           push: true
           platforms: linux/amd64

.github/workflows/e2e.yml

@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       # First attempt at build
       - name: Build e2e (attempt 1)
         id: build_e2e_try1
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           platforms: linux/amd64
           cache-from: type=gha
@@ -55,7 +55,7 @@ jobs:
       - name: Build e2e (attempt 2)
         id: build_e2e_try2
         if: steps.build_e2e_try1.outcome == 'failure'
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           platforms: linux/amd64
           cache-from: type=gha
@@ -73,7 +73,7 @@ jobs:
       - name: Build e2e (attempt 3)
         id: build_e2e_try3
         if: steps.build_e2e_try2.outcome == 'failure'
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           platforms: linux/amd64
           cache-from: type=gha

.github/workflows/release.yml

@@ -10,6 +10,7 @@ permissions: {}
 jobs:
   docker:
     runs-on: ubuntu-22.04
+    environment: dockerhub
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
@@ -18,11 +19,11 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       # Build 'test' stage (default) to run tests
       - name: Test
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           platforms: linux/amd64
           cache-from: type=gha
@@ -33,7 +34,7 @@ jobs:
       # - securesystemslab/lind-wasm:latest
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
         with:
           images: |
             securesystemslab/lind-wasm
@@ -44,7 +45,7 @@ jobs:
 
       # Build 'release' stage and push to Dockerhub
       - name: Release and push
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           target: release
           push: true

.github/workflows/zizmor.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Run zizmor
         id: zizmor
-        uses: zizmorcore/zizmor-action@0dce2577a4760a2749d8cfb7a84b7d5585ebcb7d
+        uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8
         with:
           inputs: |
             .github/workflows

.gitignore

@@ -14,8 +14,7 @@ scripts/object_lists_final/
 
 #Ignore testing results
 e2e_status
-report.html
-results.json
+reports/
 
 #Ignore python cache
-__pycache__/
+__pycache__/

Makefile

@@ -74,13 +74,36 @@ sync-sysroot:
 .PHONY: test
 test: lindfs
 	# Unified harness entry point (run all discovered harnesses for e2e signal)
-	LIND_WASM_BASE=. LINDFS_ROOT=$(LINDFS_ROOT) \
+	if LIND_WASM_BASE=. LINDFS_ROOT=$(LINDFS_ROOT) \
 	python3 ./scripts/test_runner.py --export-report report.html && \
-	find reports -maxdepth 1 -name '*.json' -print -exec cat {} \;; \
-	if python3 -c "import glob,json,sys; paths=glob.glob('reports/*.json'); total=sum(int(json.load(open(p)).get('number_of_failures', 0)) for p in paths); print(f'total_failures={total}'); sys.exit(1 if total else 0)"; then \
+	find reports -maxdepth 1 -name '*.json' -print -exec cat {} \; && \
+	python3 -c "import glob,json,sys; paths=glob.glob('reports/*.json'); \
+def count_failures(node): \
+  if not isinstance(node, dict): \
+    return 0; \
+  direct=node.get('number_of_failures'); \
+  try: \
+    direct_val=int(direct) if direct is not None else None; \
+  except (TypeError, ValueError): \
+    direct_val=None; \
+  nested=sum(count_failures(v) for v in node.values() if isinstance(v, dict)); \
+  return nested if direct_val is None else max(direct_val, nested); \
+total=1 if not paths else 0; \
+for path in paths: \
+  with open(path, encoding='utf-8') as handle: \
+    total += count_failures(json.load(handle)); \
+print(f'total_failures={total}'); \
+sys.exit(1 if total else 0)"; then \
 	  echo "E2E_STATUS=pass" > e2e_status; \
 	else \
 	  echo "E2E_STATUS=fail" > e2e_status; \
+	  mkdir -p reports; \
+	  if [ ! -f report.html ]; then \
+	    printf '%s\n' '<!DOCTYPE html><html><body><h1>E2E failed before report generation</h1></body></html>' > report.html; \
+	  fi; \
+	  if [ ! -f reports/report.html ]; then cp report.html reports/report.html; fi; \
+	  if [ ! -f reports/wasm.json ]; then printf '%s\n' '{"number_of_failures":1,"results":[],"error":"missing wasm report"}' > reports/wasm.json; fi; \
+	  if [ ! -f reports/grates.json ]; then printf '%s\n' '{"number_of_failures":1,"results":[],"error":"missing grate report"}' > reports/grates.json; fi; \
 	fi; \
 	exit 0
 
@@ -147,4 +170,4 @@ distclean: clean
 	$(RM) -f results.json report.html e2e_status
 	$(RM) -r reports || true
 	$(RM) -r $(LINDFS_ROOT)/testfiles || true
-	find tests -type f \( -name '*.wasm' -o -name '*.cwasm' -o -name '*.o' \) -delete
+	find tests -type f \( -name '*.wasm' -o -name '*.cwasm' -o -name '*.o' \) -delete