Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
dRadiant committed Jul 5, 2023
2 parents b5ca4e0 + dfe183e commit 9852489
Show file tree
Hide file tree
Showing 445 changed files with 37,964 additions and 6,364 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# GitHub highlighting for Solidity files
# See https://github.com/github/linguist/pull/3973#issuecomment-357507741
*.sol linguist-language=Solidity

# Force Linux line endings on all files
# Necessary for running eipw locally
* text=auto eol=lf
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
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Bug Report
description: File a bug report
labels: ['bug']

body:
- type: markdown
attributes:
value: Thanks for taking the time to fill out this bug report!
- type: input
id: pull-request
attributes:
label: Pull Request
description: Link to the pull request where the issue occurred
validations:
required: false
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
validations:
required: true
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,3 @@ contact_links:
- name: Do you want to discuss EIP ideas or ask questions about the process?
url: https://ethereum-magicians.org/
about: Use the Fellowship of Ethereum Magicians for EIP-related discussion!
- name: Do you want to submit a bug report for one of the GitHub action bots (not Travis CI)?
url: https://github.com/ethereum/EIP-Bot/issues
about: If you have a problem with the EIP Bot, report it here!
- name: Do you want to submit a bug report for the validation bot (Travis CI)?
url: https://github.com/ethereum/eipv/issues
about: If you have a problem with EIP Validation, report it here!
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/propose-process-change.md

This file was deleted.

13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/propose-process-change.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Do you want to propose a change to the EIP process itself?
description: Use this if you want to propose changes to the EIP process
labels: ['enhancement']

body:
- type: textarea
id: proposed-change
attributes:
label: Proposed Change
description: What do you think should be different?
placeholder: Describe your proposed change here
validations:
required: true
14 changes: 14 additions & 0 deletions .github/workflows/auto-label-bot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
on:
pull_request_target:

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

steps:
- uses: Pandapip1/jekyll-label-action@28a89dbbef321fceaf3cff17f4d29c7a033c3d56
with:
token: ${{ secrets.GITHUB_TOKEN }}
config-path: config/.jekyll-labels.yml
34 changes: 0 additions & 34 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@b81356bd8302a99e2d2bcf2bb5d2d983a12f7b8d
with:
GITHUB-TOKEN: ${{ secrets.TOKEN }}
PR_NUMBER: ${{ steps.save-pr-number.outputs.pr }}
CORE_EDITORS: '@lightclient,@axic,@gcolvin,@SamWilsn,@Pandapip1'
ERC_EDITORS: '@axic,@SamWilsn,@Pandapip1'
NETWORKING_EDITORS: '@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 }}
63 changes: 63 additions & 0 deletions .github/workflows/auto-review-trigger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
on:
pull_request_target:
types:
- opened
- reopened
- synchronize
- ready_for_review
pull_request_review:
types:
- submitted
- dismissed
workflow_dispatch:
inputs:
pr_number:
description: Pull Request Number
type: string
required: true
issue_comment:
types:
- created

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

- name: Write PR Number - PR Review
run: echo $PR_NUMBER > pr-number.txt
if: github.event_name == 'pull_request_review' && github.event.review.state == 'approved' && !endsWith(github.event.sender, '-bot') && !endsWith(github.event.sender, '[bot]')
env:
PR_NUMBER: ${{ github.event.pull_request.number }}

- name: Write PR Number - Workflow Dispatch
run: echo $PR_NUMBER > pr-number.txt
if: github.event_name == 'workflow_dispatch'
env:
PR_NUMBER: ${{ inputs.pr_number }}

- name: Write PR Number - Comment Retrigger
run: echo $PR_NUMBER > pr-number.txt
if: github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '@eth-bot rerun')
env:
PR_NUMBER: ${{ github.event.issue.number }}

- name: Check File Existence
uses: andstor/file-existence-action@f02338908d150e00a4b8bebc2dad18bd9e5229b0
id: check_pr_number_exists
with:
files: pr-number.txt

- name: Save PR Number
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
if: steps.check_pr_number_exists.outputs.files_exists == 'true'
with:
name: pr-number
path: pr-number.txt
33 changes: 33 additions & 0 deletions .github/workflows/ci-rerun-trigger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
on:
issue_comment:
types:
- created

name: Continuous Integration Re-Trigger
jobs:
trigger:
runs-on: ubuntu-latest
name: Trigger
steps:
- name: Trigger
uses: actions/github-script@v6
if: github.event.issue.pull_request && contains(github.event.comment.body, '@eth-bot rerun')
with:
script: |
let pr = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.issue.number
});
await github.rest.pulls.update({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.issue.number,
body: '[RETRIGGER]\n' + pr.data.body
});
await github.rest.pulls.update({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.issue.number,
body: pr.data.body
});
94 changes: 94 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
name: Continuous Integration

on:
pull_request:
types:
- opened
- reopened
- synchronize
- ready_for_review
- edited

jobs:
save-pr:
name: Save PR Number
runs-on: ubuntu-latest

steps:
- name: Save PR number
env:
PR_NUMBER: ${{ github.event.number }}
PR_SHA: ${{ github.event.pull_request.head.sha }}
MERGE_SHA: ${{ github.sha }}
run: |
mkdir -p ./pr
echo $PR_NUMBER > ./pr/pr_number
echo $PR_SHA > ./pr/pr_sha
echo $MERGE_SHA > ./pr/merge_sha
- name: Upload PR Number
uses: actions/upload-artifact@v3
with:
name: pr_number
path: pr/

htmlproofer:
name: HTMLProofer
runs-on: ubuntu-latest

steps:
- name: Checkout EIP Repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b

- name: Install OpenSSL
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev

- name: Install Ruby
uses: ruby/setup-ruby@08245253a76fa4d1e459b7809579c62bd9eb718a
with:
ruby-version: 2.6.0
bundler-cache: true

- name: Build Website
run: |
bundle exec jekyll doctor
bundle exec jekyll build
- name: HTML Proofer
run: bundle exec htmlproofer ./_site --check-html --check-opengraph --report-missing-names --log-level=:debug --assume-extension --empty-alt-ignore --timeframe=6w --disable-external

- name: DNS Validator
run: bundle exec github-pages health-check

codespell:
name: CodeSpell
runs-on: ubuntu-latest

steps:
- name: Checkout EIP Repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b

- name: Delete Unchanged Files
uses: Pandapip1/delete-unchanged-files@2c27069573bbeb6703790ac5c872e9b1a100d96c

- name: Run CodeSpell
uses: codespell-project/actions-codespell@2391250ab05295bddd51e36a8c6295edb6343b0e
with:
check_filenames: true
ignore_words_file: config/.codespell-whitelist
skip: .git,Gemfile.lock,**/*.png,**/*.gif,**/*.jpg,**/*.svg,.codespell-whitelist,vendor,_site,_config.yml,style.css
only_warn: 1

eipw-validator:
name: EIP Walidator
runs-on: ubuntu-latest

steps:
- name: Checkout EIP Repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b

- uses: ethereum/eipw-action@dist
id: eipw
with:
token: ${{ secrets.GITHUB_TOKEN }}
unchecked: 1, 5069
Loading

0 comments on commit 9852489

Please sign in to comment.