diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index a4ec6585..79a14aa7 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -17,7 +17,7 @@ jobs: - run: rustup update - uses: actions/setup-go@v3 with: - go-version: 1.21 + go-version: 1.22 - run: scripts/check-dependencies.bash validate-rust-git-rev-deps: runs-on: ubuntu-latest diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4a06a1c5..59f7d4d1 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -21,7 +21,7 @@ jobs: - name: Setup GO uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # version v3.3.0 with: - go-version: '>=1.21.0' + go-version: '>=1.22.1' - name: Build libpreflight run: | diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml index 2d96467f..5c7ddf4f 100644 --- a/.github/workflows/soroban-rpc.yml +++ b/.github/workflows/soroban-rpc.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, ubuntu-22.04] - go: [1.21] + go: [1.22] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -63,7 +63,7 @@ jobs: # because it uses apt-get and some OSs (e.g. windows) don't have it - uses: actions/setup-go@v3 with: - go-version: 1.21 + go-version: 1.22 - run: | rustup target add ${{ matrix.rust_target }} @@ -106,7 +106,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, ubuntu-22.04] - go: [1.21] + go: [1.22] test: ['.*CLI.*', '^Test(([^C])|(C[^L])|(CL[^I])).*$'] runs-on: ${{ matrix.os }} env: diff --git a/cmd/soroban-rpc/docker/Dockerfile b/cmd/soroban-rpc/docker/Dockerfile index f1e6c078..d903fbfb 100644 --- a/cmd/soroban-rpc/docker/Dockerfile +++ b/cmd/soroban-rpc/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-bullseye as build +FROM golang:1.22-bullseye as build ARG RUST_TOOLCHAIN_VERSION=stable ARG REPOSITORY_VERSION diff --git a/go.mod b/go.mod index 9c1e46ce..b81f67ed 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/stellar/soroban-rpc -go 1.21 +go 1.22 -toolchain go1.21.1 +toolchain go1.22.1 require ( github.com/Masterminds/squirrel v1.5.4 @@ -21,7 +21,6 @@ require ( github.com/stellar/go v0.0.0-20240207003209-73de95c8eb55 github.com/stretchr/testify v1.8.4 golang.org/x/mod v0.13.0 - gotest.tools/v3 v3.5.0 ) require ( @@ -83,8 +82,6 @@ require ( github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect github.com/go-gorp/gorp/v3 v3.1.0 // indirect - github.com/google/go-cmp v0.6.0 // indirect - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect @@ -98,7 +95,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/segmentio/go-loggly v0.5.1-0.20171222203950-eb91657e62b2 // indirect diff --git a/go.sum b/go.sum index 32930a08..4cd67af2 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,6 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -804,8 +802,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= -gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=