Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Go #155

Merged
merged 7 commits into from
Feb 28, 2024
Merged

Upgrade Go #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
589d6dc
workflows: get go version from file for linter
roman-khimov Feb 27, 2024
471bcfe
workflows: update actions and OSes
roman-khimov Feb 27, 2024
0fffbef
build: use Go 1.22 to build bench and NeoGo
roman-khimov Feb 27, 2024
f234ab1
cmd: require Go 1.20 to build, fix #154
roman-khimov Feb 27, 2024
e94cd94
config: use strings.CutPrefix to simplify code
roman-khimov Feb 27, 2024
33d1559
cmd: update all dependencies
roman-khimov Feb 27, 2024
952545d
cmd: don't use deprecated type
roman-khimov Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/build/Dockerfile.bench
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builder layer
FROM golang:1.21-alpine as builder
FROM golang:1.22-alpine as builder

WORKDIR /bench

Expand Down
2 changes: 1 addition & 1 deletion .docker/build/Dockerfile.golang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builder layer
FROM golang:1.21-alpine as builder
FROM golang:1.22-alpine as builder

WORKDIR /neo-go

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ on:
jobs:
build_image:
name: Build Bench, GoNode and SharpNode docker images
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}
fetch-depth: 0
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-go@v4
- uses: actions/checkout@v4
with:
go-version: '1.19'
cache-dependency-path: cmd/go.sum
ref: ${{ github.event.inputs.ref }}

- uses: actions/checkout@v3
- uses: actions/setup-go@v5
with:
ref: ${{ github.event.inputs.ref }}
go-version-file: 'cmd/go.mod'
cache-dependency-path: cmd/go.sum

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
version: latest
working-directory: cmd
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}

Expand All @@ -65,13 +65,13 @@ jobs:

tests:
name: Run tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
benchmarks: [ 'GoSingle10wrk', 'SharpSingle10wrk', 'MixedFourNodesGoRPC50rate' ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}
fetch-depth: 0
Expand Down
13 changes: 7 additions & 6 deletions cmd/config/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,14 @@ func writeJSON(path string, obj interface{}) error {
func nodeNameFromSeedList(addresses []string, seedList []string) (string, error) {
suffix := addresses[0] // Rely on the fact that the first node address has the same format as the one provided via seed list.
for _, seed := range seedList {
if strings.HasSuffix(seed, suffix) {
node := strings.TrimSuffix(seed, suffix)
if node == "node" {
return singleNodeName, nil
}
return strings.TrimPrefix(node, "node_"), nil
node, ok := strings.CutSuffix(seed, suffix)
if !ok {
continue
}
if node == "node" {
return singleNodeName, nil
}
return strings.TrimPrefix(node, "node_"), nil
}
return "", fmt.Errorf("node with address %s is not in the seed list", addresses[0])
}
76 changes: 44 additions & 32 deletions cmd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,103 @@
module github.com/nspcc-dev/neo-bench

go 1.19
go 1.20

require (
github.com/Workiva/go-datastructures v1.0.53
github.com/docker/docker v24.0.7+incompatible
github.com/fatih/color v1.12.0
github.com/Workiva/go-datastructures v1.1.1
github.com/docker/docker v25.0.3+incompatible
github.com/fatih/color v1.16.0
github.com/k14s/ytt v0.30.0
github.com/mailru/easyjson v0.7.6
github.com/moby/moby v24.0.9+incompatible
github.com/nspcc-dev/neo-go v0.104.0
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20231121104256-0493ddbd70b2
github.com/mailru/easyjson v0.7.7
github.com/moby/moby v25.0.3+incompatible
github.com/nspcc-dev/neo-go v0.105.1
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20240227140908-cc38221d7798
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/valyala/fasthttp v1.34.0
github.com/spf13/viper v1.18.2
github.com/valyala/fasthttp v1.52.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.8.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.2-0.20231013160410-1f65e75b6dfb // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect
github.com/klauspost/compress v1.15.0 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/nspcc-dev/go-ordered-json v0.0.0-20231123160306-3374ff1e7a3c // indirect
github.com/nspcc-dev/go-ordered-json v0.0.0-20240112074137-296698a162ae // indirect
github.com/nspcc-dev/rfc6979 v0.2.0 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/onsi/gomega v1.17.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cobra v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect
github.com/twmb/murmur3 v1.1.5 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.0.3 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
Expand Down
Loading
Loading