Test

cffls · Sep 20, 2024 · 5c31d97 · 5c31d97
1 parent 5fcd172
commit 5c31d97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
       - "master"
       - "qa"
       - "develop"
+      - "upstream_merge_1.14.6"
   pull_request:
     branches:
       - "**"
@@ -79,7 +80,7 @@ jobs:
     if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
     strategy:
       matrix:
-        os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
         - uses: actions/checkout@v3

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ PACKAGE = github.com/ethereum/go-ethereum
 GO_FLAGS += -buildvcs=false
 GO_LDFLAGS += -ldflags "-X ${PACKAGE}/params.GitCommit=${GIT_COMMIT}"
 
-TESTALL = $$(go list ./... | grep -v go-ethereum/cmd/)
+TESTALL = $$(go list ./... | grep -v go-ethereum/cmd/ | grep 'go-ethereum/core$$')
 TESTE2E = ./tests/...
 GOTEST = GODEBUG=cgocheck=0 go test $(GO_FLAGS) $(GO_LDFLAGS) -p 1