Merge branch 'master' into ryan/add-eip-nft-redeemables

ethereum · Oct 31, 2023 · d27301b · d27301b
2 parents dd10aaf + d56cb13
commit d27301b
Show file tree

Hide file tree

Showing 20 changed files with 2,434 additions and 259 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @eth-bot
+* @eip-review-bot
diff --git a/.github/workflows/auto-review-bot.yml b/.github/workflows/auto-review-bot.yml
@@ -24,7 +24,7 @@ jobs:
 
       - name: Auto Review Bot
         id: auto-review-bot
-        uses: ethereum/eip-review-bot@3e9905fcb72cf81ae9ed732df429c28b17e155b1
+        uses: ethereum/eip-review-bot@dist
         continue-on-error: true
         with:
           token: ${{ secrets.TOKEN }}

diff --git a/.github/workflows/auto-review-trigger.yml b/.github/workflows/auto-review-trigger.yml
@@ -21,15 +21,19 @@ jobs:
     runs-on: ubuntu-latest
     name: Trigger
     steps:
+      - name: Stop Bot Recursion
+        run: exit 1
+        if: (endsWith(github.event.sender.login, '-bot') || endsWith(github.event.sender.login, '[bot]')) && github.event.sender.login != 'renovate[bot]'
+
       - name: Write PR Number - PR Target
         run: echo $PR_NUMBER > pr-number.txt
-        if: github.event_name == 'pull_request_target' && ((!endsWith(github.event.sender.login, '-bot') && !endsWith(github.event.sender.login, '[bot]')) || github.event.sender.login == 'renovate[bot]')
+        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' && !endsWith(github.event.sender.login, '-bot') && !endsWith(github.event.sender.login, '[bot]')
+        if: github.event_name == 'pull_request_review'
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,15 +41,40 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - name: Checkout EIP Repository
-        uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f
-
-      - name: Install Ruby
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf
+      - name: Checkout EIPs
+        uses: actions/checkout@v4
         with:
-          ruby-version: 3.1.4 # 3.2 fails, see https://github.com/github/pages-gem/issues/879
-          bundler-cache: true
-
+          repository: ethereum/EIPs
+          path: ''
+      - name: Checkout ERCs
+        uses: actions/checkout@v4
+        with:
+          repository: ethereum/ERCs
+          path: ERCs
+      - name: Merge Repos
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/ERCs/ERCS
+          mkdir -p $GITHUB_WORKSPACE/ERCs/EIPS
+          cp -rp $GITHUB_WORKSPACE/ERCs/ERCS/. $GITHUB_WORKSPACE/EIPS
+          cp -rp $GITHUB_WORKSPACE/ERCs/EIPS/. $GITHUB_WORKSPACE/EIPS
+          cp -rp $GITHUB_WORKSPACE/ERCs/assets/. $GITHUB_WORKSPACE/assets
+          cd $GITHUB_WORKSPACE/EIPS
+          find . -name "erc-*.md" -type f -exec sh -c 'echo mv "$1" "$(echo "$1" | sed s/erc/eip/)"' _ {} \; | sh
+          cd $GITHUB_WORKSPACE/assets
+          find . -name "erc-*" -type d -exec sh -c 'echo mv "$1" "$(echo "$1" | sed s/erc/eip/)"' _ {} \; | sh
+          cd $GITHUB_WORKSPACE
+          rm -rf ERCs
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        with:
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Build with Jekyll
+        run: bundle exec jekyll build
+        env:
+          JEKYLL_ENV: production
+
       - name: Build Website
         run: |
           bundle exec jekyll doctor
@@ -111,11 +136,13 @@ jobs:
       - name: Checkout EIP Repository
         uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f
 
-      - uses: ethereum/eipw-action@b8de7ea9ad5cb842301e63898afb996c451c18cf
+      - uses: ethereum/eipw-action@6785fa283773db4819cb0abf17a185a1d9b6eb9f
         id: eipw
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          unchecked: 1, 5069, 5757
+          unchecked: 1
+          path: ERCS/
+          options-file: config/eipw.toml
 
   markdownlint:
     name: Markdown Linter

diff --git a/.github/workflows/post-ci.yml b/.github/workflows/post-ci.yml
@@ -35,7 +35,7 @@ jobs:
           recreate: true
           message: |
             The commit ${{ steps.save-pr-data.outputs.pr_sha }} (as a parent of ${{ steps.save-pr-data.outputs.merge_sha }}) contains errors.
-            Please inspect the [Run Summary](https://github.com/ethereum/EIPs/pull/${{ steps.save-pr-data.outputs.pr_number }}/files) for details.
+            Please inspect the [Run Summary](https://github.com/ethereum/ercs/${{ steps.save-pr-data.outputs.pr_number }}/files) for details.
 
       - name: Add Waiting Label
         uses: actions-ecosystem/action-add-labels@288072f1a3b596f4350fe135bcfe381a23abadef

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   stale:
-    if: github.repository == 'ethereum/eips'
+    if: github.repository == 'ethereum/ercs'
     runs-on: ubuntu-latest
     name: Mark Stale Issues
     steps:

diff --git a/ERCS/erc-5164.md b/ERCS/erc-5164.md
@@ -4,7 +4,8 @@ title: Cross-Chain Execution
 description: Defines an interface that supports execution across EVM networks.
 author: Brendan Asselstine (@asselstine), Pierrick Turelier (@PierrickGT), Chris Whinfrey (@cwhinfrey)
 discussions-to: https://ethereum-magicians.org/t/eip-5164-cross-chain-execution/9658
-status: Review
+status: Last Call
+last-call-deadline: 2023-11-15
 type: Standards Track
 category: ERC
 created: 2022-06-14