Skip to content

Commit 4c8d4bd

Browse files
committed
chore: CI updates for renamed module
Linter: - Block imports of `ethereum/go-ethereum` upstream module - Disable `goimports` checks on upstream code Go: - Update flaky-test regex - Run flaky and non-flaky tests in different steps as this makes it easier to spot incorrect regex Upstream delta: - Use env var in workflow instead of `libevm-base` tag -> base changes atomically with the update commit
1 parent d6d53f9 commit 4c8d4bd

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

.github/workflows/go.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@ on:
99

1010
jobs:
1111
go_test_short:
12+
env:
13+
FLAKY_REGEX: 'ava-labs/libevm/(eth|eth/tracers/js|eth/tracers/logger|accounts/abi/bind|accounts/keystore|eth/downloader|miner|ethclient|ethclient/gethclient|eth/catalyst)$'
1214
runs-on: ubuntu-latest
1315
steps:
1416
- uses: actions/checkout@v4
1517
- name: Set up Go
1618
uses: actions/setup-go@v5
1719
with:
1820
go-version: 1.21.4
19-
- name: Run tests
21+
- name: Run flaky tests sequentially
2022
run: | # Upstream flakes are race conditions exacerbated by concurrent tests
21-
FLAKY_REGEX='go-ethereum/(eth|eth/tracers/js|eth/tracers/logger|accounts/abi/bind|accounts/keystore|eth/downloader|miner|ethclient|ethclient/gethclient|eth/catalyst)$';
2223
go list ./... | grep -P "${FLAKY_REGEX}" | xargs -n 1 go test -short;
24+
- name: Run non-flaky tests concurrently
25+
run: |
2326
go test -short $(go list ./... | grep -Pv "${FLAKY_REGEX}");

.github/workflows/libevm-delta.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99

1010
jobs:
1111
diffs:
12+
env:
13+
# Last commit on `renamed-go-module` branch to be merged into `main`
14+
LIBEVM_BASE: a7f08d0e757d5a69d3e269c69dcea7e45bab97e3
1215
runs-on: ubuntu-latest
1316
steps:
1417
- uses: actions/checkout@v4
@@ -21,19 +24,19 @@ jobs:
2124
git config color.diff.old "#DC3220";
2225
git config color.diff.new "#005AB5";
2326
24-
- name: git diff libevm-base
27+
- name: git diff {LIBEVM_BASE}
2528
run: |
2629
git diff --diff-filter=a --word-diff --unified=0 --color=always \
27-
libevm-base \
30+
"${LIBEVM_BASE}" \
2831
':(exclude).golangci.yml' \
2932
':(exclude).github/**' \
3033
':(exclude)README.md';
3134
32-
- name: git diff libevm-base..main
35+
- name: git diff {LIBEVM_BASE}..main
3336
run: |
3437
git checkout main --;
3538
git diff --diff-filter=a --word-diff --unified=0 --color=always \
36-
libevm-base \
39+
"${LIBEVM_BASE}" \
3740
':(exclude).golangci.yml' \
3841
':(exclude).github/**' \
3942
':(exclude)README.md';

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,14 @@ linters-settings:
6161
gomodguard:
6262
blocked:
6363
modules:
64+
- github.com/ethereum/go-ethereum:
6465
- github.com/ava-labs/avalanchego:
6566
- github.com/ava-labs/coreth:
6667
- github.com/ava-labs/subnet-evm:
6768
revive:
6869
rules:
6970
- name: unused-parameter
70-
# Method parameters may be equired by interfaces and forcing them to be
71+
# Method parameters may be required by interfaces and forcing them to be
7172
# named _ is of questionable benefit.
7273
disabled: true
7374

@@ -84,6 +85,7 @@ issues:
8485
- gci
8586
- gofmt
8687
- goheader
88+
- goimports
8789
- gosec
8890
- gosimple
8991
- govet

0 commit comments

Comments
 (0)