Skip to content

Commit

Permalink
Merge branch 'ethereum:master' into 4886-assets-cc0
Browse files Browse the repository at this point in the history
  • Loading branch information
Pandapip1 authored Aug 11, 2022
2 parents abec7ab + a33c309 commit c0b2f7d
Show file tree
Hide file tree
Showing 27 changed files with 880 additions and 379 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
6 changes: 4 additions & 2 deletions .github/workflows/auto-label-bot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
on:
pull_request_target:

name: Auto Label Bot
jobs:
jekyll-label-action:
name: Automatic Label Bot
name: Label
runs-on: ubuntu-latest

steps:
- uses: Pandapip1/jekyll-label-action@b5fe10dda78ac1cd09f60b30008509932c40ac9f
- uses: Pandapip1/jekyll-label-action@5fcfb7bef793a76df290f8b491a5529accb7ae46
with:
token: ${{ secrets.GITHUB_TOKEN }}
config-path: config/.jekyll-labels.yml
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: 16

- name: Auto Review Bot
id: auto-review-bot
uses: ethereum/EIP-Bot@1e1bb6a58e02d28e9afa9462b00a518d9b47860e
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.

8 changes: 4 additions & 4 deletions EIPS/eip-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,17 +211,17 @@ The current EIP editors are
- Gavin John (@Pandapip1)
- Greg Colvin (@gcolvin)
- Matt Garnett (@lightclient)
- Micah Zoltu (@MicahZoltu)
- Sam Wilson (@SamWilsn)

Emeritus EIP editors are

- Casey Detrio (@cdetrio)
- Nick Johnson (@arachnid)
- Vitalik Buterin (@vbuterin)
- Hudson Jameson (@Souptacular)
- Nick Savers (@nicksavers)
- Martin Becze (@wanderer)
- Micah Zoltu (@MicahZoltu)
- Nick Johnson (@arachnid)
- Nick Savers (@nicksavers)
- Vitalik Buterin (@vbuterin)

If you would like to become an EIP editor, please check [EIP-5069](./eip-5069.md).

Expand Down
Loading

0 comments on commit c0b2f7d

Please sign in to comment.