Skip to content

Commit

Permalink
Fix EIP Bot (#5400)
Browse files Browse the repository at this point in the history
* Fix EIP-Bot CI

* Add newline to CODEOWNERS

* Make changes for testing

* Test if GH Actions is a valid codeowner

* It isn't allowed

* Fix infinite loop

* Do some tricks to avoid unneccesary extra runs

* Fixing bug

* Add Pandapip1-bot

* Fix quotes

* Another fix bites the dust

* Another fix

* Another thing

* Use my testing fork

* More fixes

* Unpin while in dev

* Add testing bot to codeowners

* Is that the bug?

* Try this fix

* Quickfix

* That was an easy fix

* Remove Pandapip1-bot references

* Update diff

* Missed some

* Pin to commit
  • Loading branch information
Pandapip1 committed Aug 10, 2022
1 parent 51503b4 commit 0b07ac5
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 124 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @eth-bot
26 changes: 0 additions & 26 deletions .github/workflows/auto-merge-bot.yml

This file was deleted.

60 changes: 60 additions & 0 deletions .github/workflows/auto-review-bot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
on:
workflow_run:
workflows:
- Auto Review Bot Trigger
types:
- completed

name: Auto Review Bot
jobs:
auto-review-bot:
runs-on: ubuntu-latest
name: Run
steps:
- name: Fetch PR Number
uses: dawidd6/action-download-artifact@6765a42d86407a3d532749069ac03705ad82ebc6
with:
name: pr-number
workflow: auto-review-trigger.yml
run_id: ${{ github.event.workflow_run.id }}

- name: Save PR Number
id: save-pr-number
run: echo "::set-output name=pr::$(cat pr-number.txt)"

- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
repository: ethereum/EIPs # Default, but best to be explicit here
ref: master

- name: Setup Node.js Environment
uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93
with:
node-version: 14

- name: Auto Review Bot
id: auto-review-bot
uses: ethereum/EIP-Bot@252101922c71d76a422d9b2c04875f88cd6494d9
with:
GITHUB-TOKEN: ${{ secrets.TOKEN }}
PR_NUMBER: ${{ steps.save-pr-number.outputs.pr }}
CORE_EDITORS: '@MicahZoltu,@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1'
ERC_EDITORS: '@lightclient,@axic,@SamWilsn,@Pandapip1'
NETWORKING_EDITORS: '@MicahZoltu,@lightclient,@axic,@SamWilsn'
INTERFACE_EDITORS: '@lightclient,@axic,@SamWilsn,@Pandapip1'
META_EDITORS: '@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1'
INFORMATIONAL_EDITORS: '@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1'
MAINTAINERS: '@alita-moore,@mryalamanchi'

- name: Enable Auto-Merge
uses: reitermarkus/automerge@a25ea0de41019ad13380d22e01db8f5638f1bcdc
with:
token: ${{ secrets.TOKEN }}
pull-request: ${{ steps.save-pr-number.outputs.pr }}

- name: Submit Approval
uses: hmarr/auto-approve-action@24ec4c8cc344fe1cdde70ff37e55ace9e848a1d8
with:
github-token: ${{ secrets.TOKEN }}
pull-request-number: ${{ steps.save-pr-number.outputs.pr }}
66 changes: 66 additions & 0 deletions .github/workflows/auto-review-trigger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
on:
pull_request_target:
types:
- opened
- reopened
- synchronize
pull_request_review:
types:
- submitted
- dismissed
workflow_dispatch:
inputs:
pr_number:
description: Pull Request Number
type: string
required: true

name: Auto Review Bot Trigger
jobs:
pull-request:
runs-on: ubuntu-latest
name: Pull Request
if: github.event_name == 'pull_request_target'
steps:
- name: Write PR Number
run: echo $PR_NUMBER > pr-number.txt
env:
PR_NUMBER: ${{ github.event.number }}

- name: Save PR Number
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
with:
name: pr-number
path: pr-number.txt

pr-review:
runs-on: ubuntu-latest
name: Review
if: github.event_name == 'pull_request_review' && github.event.review.sender != 'eth-bot' && github.event.review.state == 'approved'
steps:
- name: Write PR Number
run: echo $PR_NUMBER > pr-number.txt
env:
PR_NUMBER: ${{ github.event.pull_request.number }}

- name: Save PR Number
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
with:
name: pr-number
path: pr-number.txt

dispatch:
runs-on: ubuntu-latest
name: Dispatch
if: github.event_name == 'workflow_dispatch'
steps:
- name: Write PR Number
run: echo $PR_NUMBER > pr-number.txt
env:
PR_NUMBER: ${{ inputs.pr_number }}

- name: Save PR Number
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
with:
name: pr-number
path: pr-number.txt
13 changes: 0 additions & 13 deletions .github/workflows/enable-automerge.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/manual-bot-rerun.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/rerun-bot-pull-request-review.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/rerun-bot-workflow-run.yml

This file was deleted.

14 changes: 9 additions & 5 deletions EIPS/eip-5069.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ requires: 1
---

## Abstract

An Ethereum Improvement Proposal (EIP) is a design document providing information to the Ethereum community, or describing a new feature for Ethereum or its processes or environment. The EIP standardization process is a mechanism for proposing new features, for collecting community technical input on an issue, and for documenting the design decisions that have gone into Ethereum. Because improvement proposals are key components of Ethereum blockchain, it is important that they are well reviewed before reaching `Final` status. EIPs are stored in text files in a versioned repository which is monitored by the EIP editors.

This EIP describes the recommended process for becoming an EIP editor.

## Specification

The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in RFC 2119.

### Application and Onboarding Process

Anyone having a good understanding of the EIP standardization and network upgrade process, intermediate level experience on the core and/or application side of the Ethereum blockchain, and willingness to contribute to the process management MAY apply to become an EIP editor. Potential EIP editors SHOULD have the following skills:
- Good communication skills
- Ability to handle contentious discourse
Expand All @@ -41,10 +44,10 @@ index 79558a3..079b196 100644

Emeritus EIP editors are

diff --git a/.github/workflows/auto-merge-bot.yml b/.github/workflows/auto-merge-bot.yml
diff --git a/.github/workflows/auto-review-bot.yml b/.github/workflows/auto-review-bot.yml
index 5730343..3d162ea 100644
--- a/.github/workflows/auto-merge-bot.yml
+++ b/.github/workflows/auto-merge-bot.yml
--- a/.github/workflows/auto-review-bot.yml
+++ b/.github/workflows/auto-review-bot.yml
@@ -17,12 +17,12 @@ jobs:
id: auto-merge-bot
with:
Expand All @@ -62,16 +65,17 @@ index 5730343..3d162ea 100644
+ META_EDITORS: "@lightclient,@axic,@gcolvin,@SamWilsn"
+ INFORMATIONAL_EDITORS: "@lightclient,@axic,@gcolvin,@SamWilsn"
MAINTAINERS: "@alita-moore,@mryalamanchi"
enable-auto-merge:
if: github.repository == 'ethereum/eips'
```

### Special Merging Rules for this EIP

This EIP MUST have the same rules regarding changes as [EIP-1](./eip-1.md).

## Rationale

- "6 months" was chosen as the cutoff for denoting `Stagnant` EIPs terminally-`Stagnant` arbitrarily.
- This EIP requires special merging rules for the same reason [EIP-1](./eip-1.md) does.

## Copyright

Copyright and related rights waived via [CC0](../LICENSE.md).

3 comments on commit 0b07ac5

@Scamreno
Copy link

Choose a reason for hiding this comment

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

Pandapip1-patch-1 #6976

@Scamreno
Copy link

Choose a reason for hiding this comment

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

.github/workflows/auto-merge-bot.yml #5414 #5400 #8575 #8575 #8701 #7206

@Scamreno
Copy link

Choose a reason for hiding this comment

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

Thanks

Please sign in to comment.