From ade0f710ccf823b1f1154e00041720bc474de014 Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 27 May 2026 18:14:16 +0800 Subject: [PATCH] fix: optimize LEZ checkout --- .github/actions/checkout-lez/action.yml | 18 ++++++++++++ .github/workflows/fuzz-afl.yml | 20 +++---------- .github/workflows/fuzz.yml | 37 ++++++------------------- .github/workflows/lint.yml | 13 ++++----- 4 files changed, 35 insertions(+), 53 deletions(-) create mode 100644 .github/actions/checkout-lez/action.yml diff --git a/.github/actions/checkout-lez/action.yml b/.github/actions/checkout-lez/action.yml new file mode 100644 index 0000000..435920a --- /dev/null +++ b/.github/actions/checkout-lez/action.yml @@ -0,0 +1,18 @@ +name: Checkout logos-execution-zone +description: > + Checks out logos-blockchain/logos-execution-zone into a sub-directory and + symlinks it to the expected sibling path (../logos-execution-zone) so that + Cargo path dependencies resolve correctly. + +runs: + using: composite + steps: + - name: Checkout logos-execution-zone alongside lez-fuzzing + uses: actions/checkout@v4 + with: + repository: logos-blockchain/logos-execution-zone + path: logos-execution-zone + + - name: Symlink logos-execution-zone to sibling directory + run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + shell: bash diff --git a/.github/workflows/fuzz-afl.yml b/.github/workflows/fuzz-afl.yml index 9f520c9..542af4b 100644 --- a/.github/workflows/fuzz-afl.yml +++ b/.github/workflows/fuzz-afl.yml @@ -46,14 +46,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - name: Install logos-blockchain-circuits uses: ./logos-execution-zone/.github/actions/install-logos-blockchain-circuits @@ -276,14 +270,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - name: Install logos-blockchain-circuits uses: ./logos-execution-zone/.github/actions/install-logos-blockchain-circuits diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index b7af96a..8253824 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -38,14 +38,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - name: Install Rust nightly (required by cargo-fuzz) uses: dtolnay/rust-toolchain@nightly @@ -226,13 +220,8 @@ jobs: - fuzz_sequencer_vs_replayer steps: - uses: actions/checkout@v4 - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - uses: dtolnay/rust-toolchain@nightly with: components: llvm-tools-preview @@ -253,13 +242,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - uses: dtolnay/rust-toolchain@stable - name: Install logos-blockchain-circuits uses: ./logos-execution-zone/.github/actions/install-logos-blockchain-circuits @@ -274,13 +258,8 @@ jobs: if: github.event_name == 'schedule' steps: - uses: actions/checkout@v4 - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - uses: dtolnay/rust-toolchain@nightly with: components: llvm-tools-preview diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e71f72e..a486d6c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -31,6 +31,9 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha || github.head_ref }} + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez + - name: Install nightly toolchain for rustfmt run: rustup install nightly --profile minimal --component rustfmt @@ -47,14 +50,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha || github.head_ref }} - - name: Checkout logos-execution-zone alongside lez-fuzzing - uses: actions/checkout@v4 - with: - repository: logos-blockchain/logos-execution-zone - path: logos-execution-zone - - - name: Symlink logos-execution-zone to sibling directory - run: ln -s "$GITHUB_WORKSPACE/logos-execution-zone" "$GITHUB_WORKSPACE/../logos-execution-zone" + - name: Checkout logos-execution-zone + uses: ./.github/actions/checkout-lez - name: Install logos-blockchain-circuits uses: ./logos-execution-zone/.github/actions/install-logos-blockchain-circuits