Skip to content

Commit 1d482f9

Browse files
committed
fix(ci): Fill EOF from an evmone branch
1 parent d4394d7 commit 1d482f9

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,28 @@ runs:
3131
id: evm-builder
3232
with:
3333
type: ${{ steps.properties.outputs.evm-type }}
34+
- name: Generate fixtures using fill
35+
shell: bash
36+
run: |
37+
uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} --solc-version=${{ steps.properties.outputs.solc }} --skip-evm-dump ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }}
3438
- name: Wrap ethereum/tests fixtures with eofwrap tool
3539
shell: bash
3640
if: ${{ steps.properties.outputs.eofwrap }}
3741
run: |
3842
curl -L ${tests_url}${tests_version}.tar.gz | tar -xz
3943
ls -l
40-
uv run eofwrap tests-${tests_version}/BlockchainTests/GeneralStateTests/ fixtures_${{ inputs.release_name }}/${output_path}
41-
mkdir -p ./fixtures_${{ inputs.release_name }}/.meta/
42-
mv fixtures_${{ inputs.release_name }}/${output_path}/metrics.json ./fixtures_${{ inputs.release_name }}/.meta/eofwrap_metrics.json
44+
uv run eofwrap tests-${tests_version}/BlockchainTests/GeneralStateTests/ fixtures/${output_path}
45+
rm -rf fixtures_${{ inputs.release_name }}
46+
mkdir -p ./fixtures/.meta
47+
mv fixtures/${output_path}/metrics.json ./fixtures/.meta/eofwrap_metrics.json
48+
gunzip fixtures_${{ inputs.release_name }}.tar.gz
49+
tar rf fixtures_${{ inputs.release_name }}.tar fixtures
50+
gzip fixtures_${{ inputs.release_name }}.tar
51+
rm -rf fixtures
4352
env:
4453
tests_url: https://github.com/ethereum/tests/archive/refs/tags/v
4554
tests_version: 14.1
4655
output_path: blockchain_tests/unscheduled/eofwrap
47-
- name: Generate fixtures using fill
48-
shell: bash
49-
run: |
50-
uv run fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} --solc-version=${{ steps.properties.outputs.solc }} --skip-evm-dump ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.release_name }}.tar.gz --build-name ${{ inputs.release_name }}
5156
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
5257
with:
5358
name: fixtures_${{ inputs.release_name }}

.github/configs/evm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ zkevm:
1919
eip7692:
2020
impl: evmone
2121
repo: ethereum/evmone
22-
ref: master
22+
ref: evmc-experimental
2323
targets: ["evmone-t8n", "evmone-eofparse"]

0 commit comments

Comments
 (0)