Skip to content

ci(l1): use upstream hive repo. #3640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/workflows/pr-main_l1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
paths-ignore:
- "crates/l2/**" # Behind a feature flag not used in this workflow

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
# concurrency:
# group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
# cancel-in-progress: false

jobs:
lint:
Expand Down Expand Up @@ -80,12 +80,12 @@ jobs:
name: "Setup Hive"
runs-on: ubuntu-latest
env:
HIVE_COMMIT_HASH: 8e8c83f5c5a06561407a6a7848f5a4b32a10a467 # commit from our fork
HIVE_COMMIT_HASH: 276ca9deaee8e5831b11fa6e884a9479ee8ca140
steps:
- uses: actions/checkout@v4
- name: Setup Hive
run: |
git clone --single-branch --branch master https://github.com/lambdaclass/hive
git clone --single-branch --branch master https://github.com/ethereum/hive
cd hive
git checkout --detach ${{ env.HIVE_COMMIT_HASH }}
go build .
Expand All @@ -99,8 +99,9 @@ jobs:
name: Assertoor - ${{ matrix.name }}
runs-on: ubuntu-latest
needs: [docker_build]
if: ${{ github.event_name != 'merge_group' }}
if: ${{ always() && github.event_name != 'merge_group' }}
strategy:
fail-fast: false
matrix:
include:
- name: Transaction Check
Expand Down Expand Up @@ -139,8 +140,9 @@ jobs:
name: Hive - ${{ matrix.name }}
runs-on: ubuntu-latest
needs: [docker_build, setup-hive]
if: ${{ github.event_name != 'merge_group' }}
if: ${{ always() && github.event_name != 'merge_group' }}
strategy:
fail-fast: false
matrix:
include:
- name: "Rpc Compat tests"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ setup-hive: ## 🐝 Set up Hive testing framework
git pull origin $(HIVE_BRANCH) && \
go build .; \
else \
git clone --branch $(HIVE_BRANCH) https://github.com/lambdaclass/hive && \
git clone --branch $(HIVE_BRANCH) https://github.com/ethereum/hive && \
cd hive && \
git checkout $(HIVE_BRANCH) && \
go build .; \
Expand Down
Loading