From 51812e244cff7a73c537ebdde6fe0f55255b8057 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Fri, 11 Oct 2024 18:07:12 +0100 Subject: [PATCH 1/4] chore: update GitHub workflow refs to `main` branch --- .github/workflows/go.yml | 4 ++-- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/libevm-delta.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ec48e30d725d..fdbd66728a35 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,9 +2,9 @@ name: Go on: push: - branches: [ libevm ] + branches: [ main ] pull_request: - branches: [ libevm ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index be2fc92a6c6e..e35d21d843d3 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -2,9 +2,9 @@ name: golangci-lint on: push: - branches: [ libevm ] + branches: [ main ] pull_request: - branches: [ libevm ] + branches: [ main ] workflow_dispatch: permissions: diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 7513fc1ca462..400b009dc3d9 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -2,9 +2,9 @@ name: libevm delta on: push: - branches: [ libevm ] + branches: [ main ] pull_request: - branches: [ libevm ] + branches: [ main ] workflow_dispatch: jobs: @@ -28,9 +28,9 @@ jobs: ':(exclude).golangci.yml' \ ':(exclude).github/**'; - - name: git diff libevm-base..libevm + - name: git diff libevm-base..main run: | - git checkout libevm --; + git checkout main --; git diff --diff-filter=a --word-diff --unified=0 --color=always \ libevm-base \ ':(exclude).golangci.yml' \ From a443b1f452b6d665a81ff1aa07c8e34860b2a181 Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Fri, 11 Oct 2024 18:09:10 +0100 Subject: [PATCH 2/4] chore: update README reference to old repo path --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b4f80524a043..efb72b5b0786 100644 --- a/README.md +++ b/README.md @@ -361,4 +361,4 @@ The libevm (i) _additions_ to the go-ethereum library (i.e. all code in files wi be it a directory or file name); and (ii) _modifications_ to existing go-ethereum code; are licensed under the [GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html), also included in our repository in the `COPYING.LESSER` file. A comprehensive outline of _modifications_ is -produced by the [libevm delta workflow](https://github.com/ava-labs/go-ethereum/actions/workflows/libevm-delta.yml). +produced by the [libevm delta workflow](https://github.com/ava-labs/libevm/actions/workflows/libevm-delta.yml). From 3754c14b01bc3a61f65d7a211a6e38233c1b6abd Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Fri, 11 Oct 2024 18:12:54 +0100 Subject: [PATCH 3/4] chore: exclude `README.md` from `libevm-delta` workflow --- .github/workflows/libevm-delta.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/libevm-delta.yml b/.github/workflows/libevm-delta.yml index 400b009dc3d9..01caed2ced2c 100644 --- a/.github/workflows/libevm-delta.yml +++ b/.github/workflows/libevm-delta.yml @@ -26,7 +26,8 @@ jobs: git diff --diff-filter=a --word-diff --unified=0 --color=always \ libevm-base \ ':(exclude).golangci.yml' \ - ':(exclude).github/**'; + ':(exclude).github/**' \ + ':(exclude)README.md'; - name: git diff libevm-base..main run: | @@ -34,5 +35,5 @@ jobs: git diff --diff-filter=a --word-diff --unified=0 --color=always \ libevm-base \ ':(exclude).golangci.yml' \ - ':(exclude).github/**'; - + ':(exclude).github/**' \ + ':(exclude)README.md'; From 2a88817a148848c57acc038c14e240eb2867b3fb Mon Sep 17 00:00:00 2001 From: Arran Schlosberg Date: Fri, 11 Oct 2024 18:20:08 +0100 Subject: [PATCH 4/4] chore: mark `accounts/abi/bind` test flaky --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fdbd66728a35..e79c211a4265 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -18,6 +18,6 @@ jobs: go-version: 1.21.4 - name: Run tests run: | # Upstream flakes are race conditions exacerbated by concurrent tests - FLAKY_REGEX='go-ethereum/(eth|eth/tracers/js|eth/tracers/logger|accounts/keystore|eth/downloader|miner|ethclient|ethclient/gethclient|eth/catalyst)$'; + FLAKY_REGEX='go-ethereum/(eth|eth/tracers/js|eth/tracers/logger|accounts/abi/bind|accounts/keystore|eth/downloader|miner|ethclient|ethclient/gethclient|eth/catalyst)$'; go list ./... | grep -P "${FLAKY_REGEX}" | xargs -n 1 go test -short; go test -short $(go list ./... | grep -Pv "${FLAKY_REGEX}");