feat(ci): overhaul fixture releases

Author: spencer-tb

.github/actions/build-evm-base/action.yaml

@@ -2,13 +2,12 @@ name: 'Build EVM'
 description: 'Resolves and builds the requested EVM binary by name'
 inputs:
   type:
-    description: 'Type of EVM binary to build'
+    description: 'Type of EVM binary to build (key in .github/configs/evm.yaml)'
     required: true
-    default: 'main'
 outputs:
   impl:
     description: "Implementation of EVM binary to build"
-    value: ${{ steps.config-evm-reader.outputs.impl }}
+    value: ${{ inputs.type }}
   repo:
     description: "Repository to use to build the EVM binary"
     value: ${{ steps.config-evm-reader.outputs.repo }}
@@ -17,60 +16,48 @@ outputs:
     value: ${{ steps.config-evm-reader.outputs.ref }}
   evm-bin:
     description: "Binary name of the evm tool to use"
-    value: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}
+    value: ${{ steps.config-evm-reader.outputs.evm-bin }}
   x-dist:
-    description: "Binary name of the evm tool to use"
-    value: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}
+    description: "Number of parallel pytest-xdist workers to use"
+    value: ${{ steps.config-evm-reader.outputs.x-dist }}
 runs:
   using: "composite"
   steps:
-    - name: Get the selected EVM version from the .github/configs/evm.yaml
+    - name: Get the selected EVM configuration from .github/configs/evm.yaml
       id: config-evm-reader
       shell: bash
       run: |
         awk "/^${{ inputs.type }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./.github/configs/evm.yaml \
         | sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
-    - name: Get the EVM implementation configuration from .github/configs/evm-impl-config.yaml
-      id: config-evm-impl-config-reader
-      shell: bash
-      run: |
-        awk "/^${{ steps.config-evm-reader.outputs.impl }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./.github/configs/evm-impl.yaml \
-        | sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
     - name: Print Variables for the selected EVM type
       shell: bash
       run: |
-        echo "Implementation: ${{ steps.config-evm-reader.outputs.impl }}"
+        echo "Implementation: ${{ inputs.type }}"
         echo "Repository: ${{ steps.config-evm-reader.outputs.repo }}"
         echo "Reference: ${{ steps.config-evm-reader.outputs.ref }}"
-        echo "EVM Binary: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}"
-        echo "X-Dist parameter: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}"
+        echo "EVM Binary: ${{ steps.config-evm-reader.outputs.evm-bin }}"
+        echo "X-Dist parameter: ${{ steps.config-evm-reader.outputs.x-dist }}"
     - name: Skip building for EELS
-      if: steps.config-evm-reader.outputs.impl == 'eels'
+      if: inputs.type == 'eels'
       shell: bash
       run: echo "Skipping build for EELS"
     - name: Build the EVM using Geth action
-      if: steps.config-evm-reader.outputs.impl == 'geth'
+      if: inputs.type == 'geth'
       uses: ./.github/actions/build-evm-client/geth
       with:
         repo: ${{ steps.config-evm-reader.outputs.repo }}
         ref: ${{ steps.config-evm-reader.outputs.ref }}
     - name: Build the EVM using EVMONE action
-      if: steps.config-evm-reader.outputs.impl == 'evmone'
+      if: inputs.type == 'evmone'
       uses: ./.github/actions/build-evm-client/evmone
       with:
         repo: ${{ steps.config-evm-reader.outputs.repo }}
         ref: ${{ steps.config-evm-reader.outputs.ref }}
-        # `targets` in the evm.yaml must be an inline array to not interfere with `config-evm-reader`'s parsing
+        # `targets` in evm.yaml must be an inline array to not interfere with `config-evm-reader`'s parsing
         targets: ${{ join(fromJSON(steps.config-evm-reader.outputs.targets), ' ') }}
     - name: Build the EVM using Besu action
-      if: steps.config-evm-reader.outputs.impl == 'besu'
+      if: inputs.type == 'besu'
       uses: ./.github/actions/build-evm-client/besu
       with:
         repo: ${{ steps.config-evm-reader.outputs.repo }}
         ref: ${{ steps.config-evm-reader.outputs.ref }}
-    - name: Build the EVM using EthJS action
-      if: steps.config-evm-reader.outputs.impl == 'ethjs'
-      uses: ./.github/actions/build-evm-client/ethjs
-      with:
-        repo: ${{ steps.config-evm-reader.outputs.repo }}
-        ref: ${{ steps.config-evm-reader.outputs.ref }}

.github/actions/build-evm-client/ethjs/action.yaml

@@ -1,13 +1,21 @@
 eels:
-  impl: eels
   repo: null
   ref: null
-static:
-  impl: evmone
+  evm-bin: null
+  x-dist: auto
+evmone:
   repo: ethereum/evmone
   ref: master
   targets: ["evmone-t8n"]
-benchmark:
-  impl: geth
+  evm-bin: evmone-t8n
+  x-dist: auto
+geth:
   repo: ethereum/go-ethereum
-  ref: master
+  ref: master
+  evm-bin: evm
+  x-dist: auto
+besu:
+  repo: hyperledger/besu
+  ref: main
+  evm-bin: evmtool
+  x-dist: 0

.github/configs/evm-impl.yaml

@@ -1,19 +1,12 @@
 # Unless filling for special features, all features should fill for previous forks (starting from Frontier) too
-mainnet:
+consensus:
   evm-type: eels
-  fill-params: --until=BPO2 --generate-all-formats
+  fill-params: --until=BPO4
 
 benchmark:
-  evm-type: benchmark
-  fill-params: --fork=Osaka --generate-all-formats --gas-benchmark-values 1,5,10,30,60,100,150 ./tests/benchmark/compute --maxprocesses=30 --dist=worksteal
-  feature_only: true
+  evm-type: evmone
+  fill-params: --fork=Amsterdam --gas-benchmark-values 1,10,30,60,100,150 -m "benchmark and not state_test" ./tests/benchmark
 
-benchmark_fast:
-  evm-type: benchmark
-  fill-params: --fork=Osaka --generate-all-formats --gas-benchmark-values 100 ./tests/benchmark/compute
-  feature_only: true
-
-bal:
+devnet:
   evm-type: eels
-  fill-params: --fork=Amsterdam
-  feature_only: true
+  fill-params: --until=Amsterdam

.github/configs/evm.yaml

@@ -142,14 +142,22 @@ def main() -> None:
     fork_ranges = load_config(FORK_RANGES_CONFIG) or []
     name = sys.argv[1]
 
-    if name not in config or not isinstance(config[name], dict):
+    # `<feat>-devnet` releases (e.g. bal-devnet) share the `devnet` entry,
+    # while keeping their friendly name in the matrix and artifact outputs.
+    lookup = (
+        "devnet"
+        if name.endswith("-devnet") and "devnet" in config
+        else name
+    )
+
+    if lookup not in config or not isinstance(config[lookup], dict):
         print(
-            f"Error: feature '{name}' not found in {FEATURE_CONFIG}.",
+            f"Error: feature '{lookup}' not found in {FEATURE_CONFIG}.",
             file=sys.stderr,
         )
         sys.exit(1)
 
-    build, labels = build_matrix(config[name], name, fork_ranges)
+    build, labels = build_matrix(config[lookup], name, fork_ranges)
 
     print(f"build_matrix={json.dumps(build)}")
     print(f"feature_name={name}")

.github/configs/feature.yaml

@@ -22,8 +22,14 @@ def get_release_props(release: str) -> None:
     with open(RELEASE_PROPS_FILE) as f:
         data = yaml.safe_load(f)
     if release not in data:
-        print(f"Error: Release {release} not found in {RELEASE_PROPS_FILE}.")
-        sys.exit(1)
+        # `<feat>-devnet` releases (e.g. bal-devnet) share the `devnet` entry.
+        if release.endswith("-devnet") and "devnet" in data:
+            release = "devnet"
+        else:
+            print(
+                f"Error: Release {release} not found in {RELEASE_PROPS_FILE}."
+            )
+            sys.exit(1)
     print("\n".join(f"{key}={value}" for key, value in data[release].items()))