Skip to content

Commit 8193358

Browse files
committed
feat(github): Add evm-impl.yaml config file
1 parent 3d34b6e commit 8193358

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ outputs:
1717
value: ${{ steps.config-evm-reader.outputs.ref }}
1818
evm-bin:
1919
description: "Binary name of the evm tool to use"
20-
value: ${{ steps.config-evm-reader.outputs.evm-bin }}
20+
value: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}
21+
x-dist:
22+
description: "Binary name of the evm tool to use"
23+
value: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}
2124
runs:
2225
using: "composite"
2326
steps:
@@ -27,13 +30,20 @@ runs:
2730
run: |
2831
awk "/^${{ inputs.type }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./configs/evm.yaml \
2932
| sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
33+
- name: Get the EVM implementation configuration from configs/evm-impl-config.yaml
34+
id: config-evm-impl-config-reader
35+
shell: bash
36+
run: |
37+
awk "/^${{ steps.config-evm-reader.outputs.impl }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./configs/evm-impl.yaml \
38+
| sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
3039
- name: Print Variables for the selected EVM type
3140
shell: bash
3241
run: |
3342
echo "Implementation: ${{ steps.config-evm-reader.outputs.impl }}"
3443
echo "Repository: ${{ steps.config-evm-reader.outputs.repo }}"
3544
echo "Reference: ${{ steps.config-evm-reader.outputs.ref }}"
36-
echo "EVM Binary: ${{ steps.config-evm-reader.outputs.evm-bin }}"
45+
echo "EVM Binary: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}"
46+
echo "X-Dist parameter: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}"
3747
- name: Build the EVM using Geth action
3848
if: steps.config-evm-reader.outputs.impl == 'geth'
3949
uses: ./.github/actions/build-geth-evm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
source env/bin/activate
3232
pip install -e .
3333
solc-select use ${{ steps.properties.outputs.solc }} --always-install
34-
fill -n auto --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.name }}.tar.gz --build-name ${{ inputs.name }}
34+
fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.name }}.tar.gz --build-name ${{ inputs.name }}
3535
- uses: actions/upload-artifact@v4
3636
with:
3737
name: fixtures_${{ inputs.name }}

configs/evm-impl.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
geth:
2+
evm-bin: evm
3+
x-dist: auto
4+
evmone:
5+
evm-bin: evmone-t8n
6+
x-dist: auto
7+
besu:
8+
evm-bin: evmtool
9+
x-dist: 0

configs/evm.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@ stable:
22
impl: geth
33
repo: ethereum/go-ethereum
44
ref: master
5-
evm-bin: evm
65
develop:
76
impl: geth
87
repo: lightclient/go-ethereum
98
ref: prague-devnet-1
10-
evm-bin: evm
119
eip7692:
1210
impl: evmone
1311
repo: ethereum/evmone
1412
ref: master
15-
evm-bin: evmone-t8n
1613
eip7692-prague:
1714
impl: besu
1815
repo: hyperledger/besu
19-
ref: main
20-
evm-bin: evmtool
16+
ref: main

configs/feature.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ eip7692:
1212
solc: 0.8.21
1313
eip7692-prague:
1414
evm-type: eip7692-prague
15-
fill-params: --fork=PragueEIP7692 ./tests/prague
15+
fill-params: --fork=PragueEIP7692 ./tests/prague/eip7692_eof_v1
1616
solc: 0.8.21

0 commit comments

Comments
 (0)