Skip to content

Commit

Permalink
Merge pull request ethereum#8 from flashbots/fix/test-non-i386-arches
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
lthibault authored Jan 26, 2024
2 parents 7141a37 + 2fd43f9 commit 70970a2
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 26 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Run unit tests on Linux

on:
push:
branches: [ main ]
pull_request:
workflow_dispatch:

env:
CGO_CFLAGS_ALLOW: "-O -D__BLST_PORTABLE__"
CGO_CFLAGS: "-O -D__BLST_PORTABLE__"

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ '1.20', '1.21.x' ]
# goarch: [amd64, arm64]

steps:
- uses: actions/checkout@v4
- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Run unit tests
run: go test -short ./accounts ./cmd/geth ./core ./core/types ./core/vm ./eth/... ./internal/ethapi/... ./miner ./params ./suave/...
23 changes: 0 additions & 23 deletions .github/workflows/go.yml

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/geth/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func defaultNodeConfig() node.Config {
cfg.Name = clientIdentifier
cfg.Version = params.VersionWithCommit(git.Commit, git.Date)
cfg.HTTPModules = append(cfg.HTTPModules, "eth", "suavex")
cfg.WSModules = append(cfg.WSModules, "eth")
cfg.WSModules = append(cfg.WSModules, "eth", "suavex")
cfg.IPCPath = "geth.ipc"
return cfg
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/geth/consolecmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
)

const (
ipcAPIs = "admin:1.0 clique:1.0 debug:1.0 engine:1.0 eth:1.0 miner:1.0 net:1.0 rpc:1.0 txpool:1.0 web3:1.0"
httpAPIs = "eth:1.0 net:1.0 rpc:1.0 web3:1.0"
ipcAPIs = "admin:1.0 clique:1.0 debug:1.0 engine:1.0 eth:1.0 miner:1.0 net:1.0 rpc:1.0 suavex:1.0 txpool:1.0 web3:1.0"
httpAPIs = "eth:1.0 net:1.0 rpc:1.0 suavex:1.0 web3:1.0"
)

// spawns geth with the given command line args, using a set of flags to minimise
Expand Down

0 comments on commit 70970a2

Please sign in to comment.