From b76f5b2925ce3fe6eeea091e40c0ba4fcbf8368b Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 15:23:32 +0100 Subject: [PATCH 01/16] chore: workflow to print diffs vs `libevm-base` tag --- .github/workflows/diff_from_libevm-base.sh | 7 +++++++ .github/workflows/libevm-delta.yml | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100755 .github/workflows/diff_from_libevm-base.sh create mode 100644 .github/workflows/libevm-delta.yml diff --git a/.github/workflows/diff_from_libevm-base.sh b/.github/workflows/diff_from_libevm-base.sh new file mode 100755 index 000000000000..0f8a1ad64e1b --- /dev/null +++ b/.github/workflows/diff_from_libevm-base.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -u; + +git diff --diff-filter=a --word-diff --unified=0 libevm-base.."${1}" \ + ':(exclude).golangci.yml' \ + ':(exclude).github/**' \ No newline at end of file diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml new file mode 100644 index 000000000000..45ea37cd3673 --- /dev/null +++ b/.github/workflows/libevm-delta.yml @@ -0,0 +1,20 @@ +name: libevm delta + +on: + push: + branches: [ libevm ] + pull_request: + branches: [ libevm ] + workflow_dispatch: + +jobs: + go_test_short: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Diff libevm-base..HEAD + run: | + .github/workflows/diff_from_libevm-base.sh HEAD + - name: Diff libevm-base..libevm + run: | + .github/workflows/diff_from_libevm-base.sh libevm From d9b2fdbf37839b0374d4454c706923b830109542 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 15:28:21 +0100 Subject: [PATCH 02/16] fix: job name --- .github/workflows/libevm-delta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 45ea37cd3673..7bdb519b1261 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: jobs: - go_test_short: + diffs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 3ded066e431d05d192b6c6c424ed148a819d6f49 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 15:31:27 +0100 Subject: [PATCH 03/16] fix: use `${{ github.ref_name }}` instead of `HEAD` --- .github/workflows/libevm-delta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 7bdb519b1261..43f2e2a70960 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Diff libevm-base..HEAD + - name: Diff libevm-base..{github.ref_name} run: | - .github/workflows/diff_from_libevm-base.sh HEAD + .github/workflows/diff_from_libevm-base.sh ${{ github.ref_name }} - name: Diff libevm-base..libevm run: | .github/workflows/diff_from_libevm-base.sh libevm From 686061fb2e5f3aa477e2c5f8c98fda072c892435 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 16:03:32 +0100 Subject: [PATCH 04/16] fix: use `github.sha` instead of `github.ref_name` --- .github/workflows/libevm-delta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 43f2e2a70960..4c98d0643675 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Diff libevm-base..{github.ref_name} + - name: Diff libevm-base..[workflow trigger sha] run: | - .github/workflows/diff_from_libevm-base.sh ${{ github.ref_name }} + .github/workflows/diff_from_libevm-base.sh ${{ github.sha }} - name: Diff libevm-base..libevm run: | .github/workflows/diff_from_libevm-base.sh libevm From c3d3e9f1a07691f4fce2b5cb0d3677da46bf5f90 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 16:08:00 +0100 Subject: [PATCH 05/16] fix: `fetch-tags: true` --- .github/workflows/libevm-delta.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 4c98d0643675..63172942d334 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -12,6 +12,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + fetch-tags: true - name: Diff libevm-base..[workflow trigger sha] run: | .github/workflows/diff_from_libevm-base.sh ${{ github.sha }} From 866390097db56e4313252e5c50f84b633113d0f8 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 16:13:31 +0100 Subject: [PATCH 06/16] chore: fml --- .github/workflows/libevm-delta.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 63172942d334..8d4757f33a48 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -14,9 +14,9 @@ jobs: - uses: actions/checkout@v4 with: fetch-tags: true - - name: Diff libevm-base..[workflow trigger sha] - run: | - .github/workflows/diff_from_libevm-base.sh ${{ github.sha }} - name: Diff libevm-base..libevm run: | .github/workflows/diff_from_libevm-base.sh libevm + - name: Diff libevm-base..HEAD + run: | + .github/workflows/diff_from_libevm-base.sh HEAD From dfb0dea8c2ab90781dbc57a9654660d2a3c94f6a Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 16:31:40 +0100 Subject: [PATCH 07/16] fix: `fetch-depth: 0` for more than just 1 commit --- .github/workflows/libevm-delta.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 8d4757f33a48..afe94b7cc84e 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -13,6 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 # everything fetch-tags: true - name: Diff libevm-base..libevm run: | From bf409f2f85fde2665928a4b3925d02c1ff8023f1 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 20:53:39 +0100 Subject: [PATCH 08/16] fix: check out branch before performing diff --- .github/workflows/diff_from_libevm-base.sh | 3 ++- .github/workflows/libevm-delta.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/diff_from_libevm-base.sh b/.github/workflows/diff_from_libevm-base.sh index 0f8a1ad64e1b..d2bd6396575a 100755 --- a/.github/workflows/diff_from_libevm-base.sh +++ b/.github/workflows/diff_from_libevm-base.sh @@ -2,6 +2,7 @@ set -u; +git checkout "${1}"; git diff --diff-filter=a --word-diff --unified=0 libevm-base.."${1}" \ ':(exclude).golangci.yml' \ - ':(exclude).github/**' \ No newline at end of file + ':(exclude).github/**'; diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index afe94b7cc84e..577a198e32ca 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -18,6 +18,6 @@ jobs: - name: Diff libevm-base..libevm run: | .github/workflows/diff_from_libevm-base.sh libevm - - name: Diff libevm-base..HEAD + - name: Diff libevm-base..${{ github.sha }} run: | - .github/workflows/diff_from_libevm-base.sh HEAD + .github/workflows/diff_from_libevm-base.sh ${{ github.sha }} From 4ee7ba3f255a4e2fac2be73b6f0318e3dccd133b Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 20:56:02 +0100 Subject: [PATCH 09/16] chore: `set -x` to aid debugging --- .github/workflows/diff_from_libevm-base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/diff_from_libevm-base.sh b/.github/workflows/diff_from_libevm-base.sh index d2bd6396575a..9ce0325d8273 100755 --- a/.github/workflows/diff_from_libevm-base.sh +++ b/.github/workflows/diff_from_libevm-base.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -u; +set -ux; git checkout "${1}"; git diff --diff-filter=a --word-diff --unified=0 libevm-base.."${1}" \ From 8ae52e4b9628828a35be5915671f1c700562a311 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 20:58:18 +0100 Subject: [PATCH 10/16] fix: add `--` suffix to `git checkout` --- .github/workflows/diff_from_libevm-base.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/diff_from_libevm-base.sh b/.github/workflows/diff_from_libevm-base.sh index 9ce0325d8273..f6b9e3d3234c 100755 --- a/.github/workflows/diff_from_libevm-base.sh +++ b/.github/workflows/diff_from_libevm-base.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -set -ux; +set -eux; -git checkout "${1}"; +git checkout "${1}" --; git diff --diff-filter=a --word-diff --unified=0 libevm-base.."${1}" \ ':(exclude).golangci.yml' \ ':(exclude).github/**'; From 9e3428290c7d1b7f952aed048bd8960bd9d6bccf Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 21:03:45 +0100 Subject: [PATCH 11/16] fix: use `github.ref_name` instead of `github.sha` --- .github/workflows/libevm-delta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 577a198e32ca..ceb4782330b0 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -18,6 +18,6 @@ jobs: - name: Diff libevm-base..libevm run: | .github/workflows/diff_from_libevm-base.sh libevm - - name: Diff libevm-base..${{ github.sha }} + - name: Diff libevm-base..${{ github.ref_name }} run: | - .github/workflows/diff_from_libevm-base.sh ${{ github.sha }} + .github/workflows/diff_from_libevm-base.sh ${{ github.ref_name }} From 110b6696e0e1248e98980d64e0574a6bf1789cab Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 21:11:05 +0100 Subject: [PATCH 12/16] refactor: move all actions inside workflow --- .github/workflows/diff_from_libevm-base.sh | 8 -------- .github/workflows/libevm-delta.yml | 11 +++++++++-- 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100755 .github/workflows/diff_from_libevm-base.sh diff --git a/.github/workflows/diff_from_libevm-base.sh b/.github/workflows/diff_from_libevm-base.sh deleted file mode 100755 index f6b9e3d3234c..000000000000 --- a/.github/workflows/diff_from_libevm-base.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -eux; - -git checkout "${1}" --; -git diff --diff-filter=a --word-diff --unified=0 libevm-base.."${1}" \ - ':(exclude).golangci.yml' \ - ':(exclude).github/**'; diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index ceb4782330b0..3c093fa596a3 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -17,7 +17,14 @@ jobs: fetch-tags: true - name: Diff libevm-base..libevm run: | - .github/workflows/diff_from_libevm-base.sh libevm + git checkout libevm --; + git diff --diff-filter=a --word-diff --unified=0 libevm-base..libevm \ + ':(exclude).golangci.yml' \ + ':(exclude).github/**'; + - name: Diff libevm-base..${{ github.ref_name }} run: | - .github/workflows/diff_from_libevm-base.sh ${{ github.ref_name }} + git checkout ${{ github.ref_name }} --; + git diff --diff-filter=a --word-diff --unified=0 libevm-base..${{ github.ref_name }} \ + ':(exclude).golangci.yml' \ + ':(exclude).github/**'; From 0b7a43155c361aa118626b57a79abf136ebd2d95 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 21:13:28 +0100 Subject: [PATCH 13/16] fix: use `github.ref` for full name --- .github/workflows/libevm-delta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 3c093fa596a3..128d6fe0abe0 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -24,7 +24,7 @@ jobs: - name: Diff libevm-base..${{ github.ref_name }} run: | - git checkout ${{ github.ref_name }} --; - git diff --diff-filter=a --word-diff --unified=0 libevm-base..${{ github.ref_name }} \ + git checkout ${{ github.ref }} --; + git diff --diff-filter=a --word-diff --unified=0 libevm-base..${{ github.ref }} \ ':(exclude).golangci.yml' \ ':(exclude).github/**'; From d1047e5b1ef2274248c1ff210163f8c2c1a030b2 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 21:16:36 +0100 Subject: [PATCH 14/16] fix: only use explicit diff for `libevm` --- .github/workflows/libevm-delta.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 128d6fe0abe0..94e030ea29de 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -15,16 +15,17 @@ jobs: with: fetch-depth: 0 # everything fetch-tags: true - - name: Diff libevm-base..libevm + + - name: git diff libevm-base run: | - git checkout libevm --; - git diff --diff-filter=a --word-diff --unified=0 libevm-base..libevm \ + git diff --diff-filter=a --word-diff --unified=0 libevm-base \ ':(exclude).golangci.yml' \ ':(exclude).github/**'; - - - name: Diff libevm-base..${{ github.ref_name }} + + - name: git diff libevm-base..libevm run: | - git checkout ${{ github.ref }} --; - git diff --diff-filter=a --word-diff --unified=0 libevm-base..${{ github.ref }} \ + git checkout libevm --; + git diff --diff-filter=a --word-diff --unified=0 libevm-base..libevm \ ':(exclude).golangci.yml' \ ':(exclude).github/**'; + From 388a23041f2f2c6ce66a7db0a648fe5f1ad91e55 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 21:23:04 +0100 Subject: [PATCH 15/16] chore: `git diff --color=always` --- .github/workflows/libevm-delta.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 94e030ea29de..49408b649e71 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -18,14 +18,16 @@ jobs: - name: git diff libevm-base run: | - git diff --diff-filter=a --word-diff --unified=0 libevm-base \ + git diff --diff-filter=a --word-diff --unified=0 --color=always \ + libevm-base \ ':(exclude).golangci.yml' \ ':(exclude).github/**'; - name: git diff libevm-base..libevm run: | git checkout libevm --; - git diff --diff-filter=a --word-diff --unified=0 libevm-base..libevm \ + git diff --diff-filter=a --word-diff --unified=0 --color=always \ + libevm-base \ ':(exclude).golangci.yml' \ ':(exclude).github/**'; From d24b291a55e60af0104cdb530b39e0ee845a29a9 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Thu, 12 Sep 2024 21:40:21 +0100 Subject: [PATCH 16/16] feat: color-blindness a11y --- .github/workflows/libevm-delta.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 49408b649e71..7513fc1ca462 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -16,6 +16,11 @@ jobs: fetch-depth: 0 # everything fetch-tags: true + - name: Color-blindness a11y + run: | # https://davidmathlogic.com/colorblind/#%23D81B60-%231E88E5-%23FFC107-%23004D40:~:text=8%20pairs%20of%20contrasting%20colors + git config color.diff.old "#DC3220"; + git config color.diff.new "#005AB5"; + - name: git diff libevm-base run: | git diff --diff-filter=a --word-diff --unified=0 --color=always \