Skip to content

feat(ci): update inputs for ci rebase/merge workflows#2072

Merged
spencer-tb merged 3 commits into
ethereum:forks/amsterdamfrom
spencer-tb:feat/ci-input-rebase-merge
Mar 10, 2026
Merged

feat(ci): update inputs for ci rebase/merge workflows#2072
spencer-tb merged 3 commits into
ethereum:forks/amsterdamfrom
spencer-tb:feat/ci-input-rebase-merge

Conversation

@spencer-tb
Copy link
Copy Markdown
Contributor

@spencer-tb spencer-tb commented Jan 23, 2026

🗒️ Description

  • Support multiple EIPs in rebase workflow (comma-separated)
  • Support combined EIP branches with + in merge and rebase workflows (e.g., eip-7708+7778)
  • Add default: 'amsterdam' to fork input in rebase action
  • Add input validation to rebase action (consistent with merge action)
  • Fix static checks to run on each rebased branch individually

Combined branches are the result of merge conflicts handled manually.

Examples

# Rebase multiple EIPs
gh workflow run eip-rebase.yaml \
  -f fork=amsterdam \
  -f eip_numbers=7708,7778,7843

# Update devnet with combined EIP branch
gh workflow run update-devnet-branch.yaml \
  -f fork=amsterdam \
  -f devnet_name=bal/2 \
  -f eip_numbers=8024,7843,7708+7778

🔗 Related Issues or PRs

N/A.

✅ Checklist

  • All: Ran fast tox checks to avoid unnecessary CI fails, see also Code Standards and Enabling Pre-commit Checks:
    uvx tox -e static
  • All: PR title adheres to the repo standard - it will be used as the squash commit message and should start type(scope):.
  • All: Considered updating the online docs in the ./docs/ directory.
  • All: Set appropriate labels for the changes (only maintainers can apply labels).

Copy link
Copy Markdown
Contributor

@Carsons-Eels Carsons-Eels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice update to this, looks good

@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 23, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.86%. Comparing base (1140c0e) to head (077c1ad).
⚠️ Report is 73 commits behind head on forks/amsterdam.

Additional details and impacted files
@@                 Coverage Diff                 @@
##           forks/amsterdam    #2072      +/-   ##
===================================================
- Coverage            86.07%   85.86%   -0.22%     
===================================================
  Files                  599      599              
  Lines                39472    39390      -82     
  Branches              3780     3770      -10     
===================================================
- Hits                 33977    33822     -155     
- Misses                4862     4938      +76     
+ Partials               633      630       -3     
Flag Coverage Δ
unittests 85.86% <ø> (-0.22%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@spencer-tb
Copy link
Copy Markdown
Contributor Author

Will resolve conflicts next week!

Copy link
Copy Markdown
Member

@marioevz marioevz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! It just needs a rebase and I've left a couple of comments. Thanks!

Comment thread .github/actions/merge-eip-branches/action.yaml
Comment thread .github/workflows/eip-rebase.yaml
@fselmo
Copy link
Copy Markdown
Contributor

fselmo commented Feb 20, 2026

bump 👀

@spencer-tb
Copy link
Copy Markdown
Contributor Author

Whoops! Thanks forgot about this one ;)
Will update when I am next online

@spencer-tb spencer-tb force-pushed the feat/ci-input-rebase-merge branch from 713c7f3 to e17a03b Compare February 23, 2026 11:31
@spencer-tb spencer-tb added C-feat Category: an improvement or new feature A-ci Area: Continuous Integration labels Feb 23, 2026
@spencer-tb
Copy link
Copy Markdown
Contributor Author

Updated. Fixed the static checks too. They were only running on the last rebased EIP.

@Carsons-Eels
Copy link
Copy Markdown
Contributor

Updated. Fixed the static checks too. They were only running on the last rebased EIP.

Did you need/want a re-review for the new changes?

@spencer-tb
Copy link
Copy Markdown
Contributor Author

Merging! Might need to revisit these nonetheless following how we approach devnet branches moving forward re conflicts.

@spencer-tb spencer-tb merged commit 3975d16 into ethereum:forks/amsterdam Mar 10, 2026
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-ci Area: Continuous Integration C-feat Category: an improvement or new feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants