Custom da merge customda daprovider interface

.github/workflows/_arbitrator.yml

@@ -37,14 +37,44 @@ jobs:
           #  so make sure it doesn't conflict with anything!
           no-cache: true
 
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@v2
+        with:
+          tool: [email protected]
+
+      - name: Create minimal nextest.toml config file
+        run: |
+          cat << EOF > nextest.toml
+          [profile.ci.junit]
+          path = "junit.xml"
+          EOF
+
       - name: Make arbitrator libraries
         run: make -j wasm-ci-build
 
       - name: Clippy check
         run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings
 
       - name: Run rust tests
-        run: cargo test -p arbutil -p prover -p jit -p stylus --release --manifest-path arbitrator/prover/Cargo.toml
+        id: run-rust-tests
+        continue-on-error: true
+        run: >-
+          cargo nextest run -p arbutil -p prover -p jit -p stylus --release
+          --manifest-path arbitrator/prover/Cargo.toml
+          --profile ci --config-file nextest.toml
+
+      - name: Upload rust test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: rust-junit-reports
+          path: ./arbitrator/target/nextest/ci/junit.xml
+
+      - name: Fail if rust tests failed
+        if: steps.run-rust-tests.outcome == 'failure'
+        run: |
+          echo "Rust tests failed. Failing the workflow as required."
+          exit 1
 
       - name: Check stylus_bechmark
         run: cargo check --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml

.github/workflows/_codecov.yml

@@ -0,0 +1,34 @@
+---
+name: codecov
+on:
+  workflow_call:
+
+jobs:
+  report_summary:
+    name: Aggregate test results
+    runs-on: ubuntu-4
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Download Go JUnit reports
+        uses: actions/download-artifact@v4
+        with:
+          name: go-junit-reports
+          path: downloaded-reports/go
+
+      - name: Download Rust JUnit reports
+        uses: actions/download-artifact@v4
+        continue-on-error: true # Rust pipeline might have not been run
+        with:
+          name: rust-junit-reports
+          path: downloaded-reports/rust
+
+      - name: Run Basic Test Results Action (Unified Report)
+        uses: codecov/basic-test-results@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          directory: 'downloaded-reports/'

.github/workflows/_fast.yml

@@ -25,7 +25,7 @@ jobs:
       - name: GolangCI Lint
         uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.1
+          version: v2.5
 
       - name: Custom Lint
         run: |

.github/workflows/_go-tests.yml

@@ -11,17 +11,13 @@ jobs:
       fail-fast: false
       matrix:
         test-mode: [defaults, pathdb, challenge, stylus, l3challenge]
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
 
     steps:
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Start redis
-        run: docker run -d -p 6379:6379 redis:latest
-
       - name: Checkout
         uses: actions/checkout@v5
         with:
@@ -44,24 +40,56 @@ jobs:
       - name: Build all lint dependencies
         run: make -j8 build-node-deps
 
+      # --------------------- PATHDB MODE ---------------------
+
       - name: run tests without race detection and path state scheme
         if: matrix.test-mode == 'pathdb'
         run: >-
           ${{ github.workspace }}/.github/workflows/gotestsum.sh
           --tags cionly --timeout 90m --cover --test_state_scheme path
 
+      # --------------------- DEFAULTS MODE ---------------------
+
       - name: run tests without race detection and hash state scheme
         if: matrix.test-mode == 'defaults'
+        id: run-tests-defaults
+        continue-on-error: true
         run: >-
           ${{ github.workspace }}/.github/workflows/gotestsum.sh
-          --tags cionly --timeout 60m --test_state_scheme hash
+          --tags cionly --timeout 60m --test_state_scheme hash --junitfile test-results/junit.xml
+
+      - name: Process JUnit XML logs
+        if: matrix.test-mode == 'defaults' && always()
+        run: python3 ${{ github.workspace }}/.github/workflows/process_junit.py test-results/
+
+      - name: Upload Go test Artifacts
+        if: matrix.test-mode == 'defaults' && always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: go-junit-reports
+          path: test-results/junit_*.xml
+
+      - name: Fail if tests failed
+        if: matrix.test-mode == 'defaults' && steps.run-tests-defaults.outcome == 'failure'
+        run: |
+          echo "One or more tests failed."
+          exit 1
 
       - name: run redis tests
         if: matrix.test-mode == 'defaults'
         run: >-
           gotestsum --format short-verbose -- -p 1 -run TestRedis ./arbnode/... ./system_tests/...
           -coverprofile=coverage-redis.txt -covermode=atomic -coverpkg=./... -- --test_redis=redis://localhost:6379/0
 
+      - name: Upload coverage to Codecov
+        if: matrix.test-mode == 'defaults'
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: false
+          files: ./coverage.txt,./coverage-redis.txt
+          verbose: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+
       - name: create block input json file
         if: matrix.test-mode == 'defaults'
         run: >-
@@ -88,6 +116,8 @@ jobs:
             exit 1
           fi
 
+      # --------------------- CHALLENGE MODES ---------------------
+
       - name: build challenge tests
         if: matrix.test-mode == 'challenge'
         run: go test -tags challengetest ./... -run=^$ -v
@@ -98,23 +128,18 @@ jobs:
           ${{ github.workspace }}/.github/workflows/gotestsum.sh
           --tags challengetest --run TestL3Challenge --timeout 120m --cover
 
+      # --------------------- CHALLENGE MODES ---------------------
+
       - name: run stylus tests
         if: matrix.test-mode == 'stylus'
         run: >-
           ${{ github.workspace }}/.github/workflows/gotestsum.sh
           --tags stylustest --run TestProgramArbitrator --timeout 60m --cover
 
+      # --------------------- ARCHIVE LOGS FOR ALL MODES ---------------------
+
       - name: Archive detailed run log
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.test-mode }}-full.log
           path: full.log
-
-      - name: Upload coverage to Codecov
-        if: matrix.test-mode == 'defaults'
-        uses: codecov/codecov-action@v5
-        with:
-          fail_ci_if_error: false
-          files: ./coverage.txt,./coverage-redis.txt
-          verbose: false
-          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 run-name: CI triggered from @${{ github.actor }} of ${{ github.head_ref }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
@@ -36,8 +36,10 @@ jobs:
               - 'arbitrator/**'
               - 'contracts/**'
               - 'Makefile'
+              - '.github/workflows/_arbitrator.yml'
             bold_legacy:
               - 'bold/legacy/**'
+              - '.github/workflows/_bold-legacy.yml'
 
   # --- Fast: Build + Lint only (required by can_proceed) ---
   fast:
@@ -63,6 +65,15 @@ jobs:
     uses: ./.github/workflows/_go-tests.yml
     secrets: inherit
 
+  # --- Summarize test results (not required by can_proceed) ---
+  codecov:
+    needs: [go-tests, arbitrator]
+    if: always()
+    uses: ./.github/workflows/_codecov.yml
+    secrets: inherit
+    permissions:
+      pull-requests: write
+
   can_proceed:
     name: can_proceed
     runs-on: ubuntu-4

.github/workflows/codeql-analysis.yml

@@ -2,7 +2,7 @@
 name: CodeQL
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:

.github/workflows/docker.yml

@@ -3,7 +3,7 @@ name: Docker build CI
 run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head_ref }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
@@ -16,17 +16,14 @@ jobs:
   docker:
     name: Docker build
     runs-on: arbitrator-ci
+    services:
+      # local registry
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
 
     steps:
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Start registry
-        run: docker run -d -p 5000:5000 registry:2.8
-
       - name: Checkout
         uses: actions/checkout@v5
         with:

.github/workflows/fuzz.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
       - id: list
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
       - uses: shogo82148/actions-go-fuzz/run@v1

.github/workflows/gotestsum.sh

@@ -11,6 +11,7 @@ timeout=""
 tags=""
 run=""
 test_state_scheme=""
+junitfile=""
 log=true
 race=false
 cover=false
@@ -48,10 +49,16 @@ while [[ $# -gt 0 ]]; do
       cover=true
       shift
       ;;
-		--nolog)
-			log=false
-			shift
-			;;
+    --nolog)
+      log=false
+      shift
+      ;;
+    --junitfile)
+      shift
+      check_missing_value $# "$1" "--junitfile"
+      junitfile=$1
+      shift
+      ;;
     *)
       echo "Invalid argument: $1"
       exit 1
@@ -61,7 +68,20 @@ done
 
 packages=$(go list ./...)
 for package in $packages; do
-  cmd="stdbuf -oL gotestsum --format short-verbose --packages=\"$package\" --rerun-fails=3 --rerun-fails-max-failures=30 --no-color=false --"
+  # Add the gotestsum flags first
+  cmd="stdbuf -oL gotestsum --format short-verbose --packages=\"$package\" --rerun-fails=1 --rerun-fails-max-failures=30 --no-color=false"
+
+  if [ "$junitfile" != "" ]; then
+    # Since we run tests package-by-package, we must make the JUnit file name unique
+    # to avoid overwriting. We'll append the package name (slugified) to the base file.
+    sanitized_package_name=$(echo "$package" | tr -c '[:alnum:]' '_')
+    unique_junit_file="${junitfile%.*}_${sanitized_package_name}.xml"
+    cmd="$cmd --junitfile \"$unique_junit_file\""
+  fi
+
+  # Append the separator and go test arguments
+  cmd="$cmd --"
+
   if [ "$timeout" != "" ]; then
     cmd="$cmd -timeout $timeout"
   fi
@@ -88,11 +108,11 @@ for package in $packages; do
       cmd="$cmd -args -- --test_loglevel=8" # Use error log level, which is the value 8 in the slog level enum for tests.
   fi
 
-	if [ "$log" == true ]; then
-			cmd="$cmd > >(stdbuf -oL tee -a full.log | grep -vE \"DEBUG|TRACE|INFO|seal\")"
-	else
-			cmd="$cmd | grep -vE \"DEBUG|TRACE|INFO|seal\""
-	fi
+  if [ "$log" == true ]; then
+      cmd="$cmd > >(stdbuf -oL tee -a full.log | grep -vE \"DEBUG|TRACE|INFO|seal\")"
+  else
+      cmd="$cmd | grep -vE \"DEBUG|TRACE|INFO|seal\""
+  fi
 
   echo ""
   echo running tests for "$package"