fix(ci): add fill-args override for BPO fork range

BPO forks cannot be specified directly via --from/--until because
explicit BPO forks collect too many tests, and transition fork classes
don't filter correctly. Work around this by using fill-args to specify
--from OsakaToBPO1AtTime15k --until Amsterdam -k "not fork_Amsterdam".

Add fill_args support to fork-range entries and the build-fixtures
action. Also remove BPO3-BPO5 from fork ordering (actual path is
Osaka->BPO1->BPO2->Amsterdam).

Author: danceratopz

.github/actions/build-fixtures/action.yaml

@@ -13,6 +13,12 @@ inputs:
   split_label:
     description: "Label for this fork-range split. Empty for unsplit builds."
     default: ""
+  fill_args:
+    description: "Override fork-range CLI args (e.g. for transition forks). Empty uses --from/--until."
+    default: ""
+  fill_k:
+    description: "pytest -k expression for additional test filtering."
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -39,21 +45,34 @@ runs:
       run: sudo apt-get install -y pigz
     - name: Generate fixtures using fill
       shell: bash
+      env:
+        FILL_ARGS_OVERRIDE: ${{ inputs.fill_args }}
+        FILL_K: ${{ inputs.fill_k }}
       run: |
         IS_SPLIT="${{ inputs.split_label }}"
 
+        # Build -k array separately to preserve spaces in the expression.
+        K_ARGS=()
+        if [ -n "$FILL_K" ]; then
+          K_ARGS=(-k "$FILL_K")
+        fi
+
         if [ -n "$IS_SPLIT" ]; then
           OUTPUT_ARG="--output=fixtures_${{ inputs.release_name }}"
-          FORK_ARGS="--generate-all-formats --from=${{ inputs.from_fork }} --until=${{ inputs.until_fork }}"
+          if [ -n "$FILL_ARGS_OVERRIDE" ]; then
+            FORK_ARGS="--generate-all-formats $FILL_ARGS_OVERRIDE"
+          else
+            FORK_ARGS="--generate-all-formats --from=${{ inputs.from_fork }} --until=${{ inputs.until_fork }}"
+          fi
         else
           OUTPUT_ARG="--output=fixtures_${{ inputs.release_name }}.tar.gz"
           FORK_ARGS=""
         fi
 
         if [ "${{ steps.evm-builder.outputs.impl }}" = "eels" ]; then
-          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
+          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS "${K_ARGS[@]}" $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
         else
-          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
+          uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} $FORK_ARGS "${K_ARGS[@]}" $OUTPUT_ARG --build-name ${{ inputs.release_name }} --no-html --durations=100 --log-level=DEBUG
         fi
     - name: Generate Benchmark Genesis Files
       if: inputs.split_label == '' && contains(inputs.release_name, 'benchmark')
@@ -76,5 +95,5 @@ runs:
       if: inputs.split_label != ''
       uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       with:
-        name: build__${{ inputs.split_label }}
+        name: fixtures__${{ inputs.split_label }}
         path: fixtures_${{ inputs.release_name }}/

.github/configs/feature.yaml

@@ -18,7 +18,9 @@ fork-ranges:
     until: Osaka
   - label: bpo
     from: BPO1
-    until: BPO5
+    until: BPO2
+    fill-args: --from OsakaToBPO1AtTime15k --until Amsterdam
+    fill-k: not fork_Amsterdam
   - label: amsterdam
     from: Amsterdam
     until: Amsterdam

.github/scripts/generate_build_matrix.py

@@ -53,9 +53,6 @@
     "Osaka",
     "BPO1",
     "BPO2",
-    "BPO3",
-    "BPO4",
-    "BPO5",
     "Amsterdam",
 ]
 
@@ -164,14 +161,17 @@ def build_matrices(
         for r in all_ranges.values():
             if r["label"] not in seen_labels:
                 seen_labels.add(r["label"])
-                build.append(
-                    {
-                        "feature": ref,
-                        "label": r["label"],
-                        "from_fork": r["from"],
-                        "until_fork": r["until"],
-                    }
-                )
+                entry = {
+                    "feature": ref,
+                    "label": r["label"],
+                    "from_fork": r["from"],
+                    "until_fork": r["until"],
+                }
+                if "fill-args" in r:
+                    entry["fill_args"] = r["fill-args"]
+                if "fill-k" in r:
+                    entry["fill_k"] = r["fill-k"]
+                build.append(entry)
 
         # Combine entries map features to their applicable labels.
         for name in group_names:

.github/workflows/release_fixture_feature.yaml

@@ -66,6 +66,8 @@ jobs:
           from_fork: ${{ matrix.from_fork }}
           until_fork: ${{ matrix.until_fork }}
           split_label: ${{ matrix.label }}
+          fill_args: ${{ matrix.fill_args }}
+          fill_k: ${{ matrix.fill_k }}
 
   combine:
     name: combine (${{ matrix.feature }})
@@ -87,9 +89,9 @@ jobs:
         run: |
           mkdir -p combined
           for label in ${{ matrix.labels }}; do
-            echo "Downloading: build__${label}"
-            gh run download ${{ github.run_id }} -n "build__${label}" --dir "split_artifacts/build__${label}"
-            cp -r "split_artifacts/build__${label}"/* combined/
+            echo "Downloading: fixtures__${label}"
+            gh run download ${{ github.run_id }} -n "fixtures__${label}" --dir "split_artifacts/fixtures__${label}"
+            cp -r "split_artifacts/fixtures__${label}"/* combined/
           done
           echo "Combined directory contents:"
           find combined -maxdepth 3 -type d | head -30

.github/workflows/release_fixture_full.yaml

@@ -58,6 +58,8 @@ jobs:
           from_fork: ${{ matrix.from_fork }}
           until_fork: ${{ matrix.until_fork }}
           split_label: ${{ matrix.label }}
+          fill_args: ${{ matrix.fill_args }}
+          fill_k: ${{ matrix.fill_k }}
 
   combine:
     name: combine (${{ matrix.feature }})
@@ -79,9 +81,9 @@ jobs:
         run: |
           mkdir -p combined
           for label in ${{ matrix.labels }}; do
-            echo "Downloading: build__${label}"
-            gh run download ${{ github.run_id }} -n "build__${label}" --dir "split_artifacts/build__${label}"
-            cp -r "split_artifacts/build__${label}"/* combined/
+            echo "Downloading: fixtures__${label}"
+            gh run download ${{ github.run_id }} -n "fixtures__${label}" --dir "split_artifacts/fixtures__${label}"
+            cp -r "split_artifacts/fixtures__${label}"/* combined/
           done
           echo "Combined directory contents:"
           find combined -maxdepth 3 -type d | head -30