diff --git a/.cirrus.yml b/.cirrus.yml index 47c0534c1..8c90a9050 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ test_arm_task: arm_container: # The Alpine image has segmentation faults when running test -race, so # use Debian instead. - image: golang:1.22-bookworm + image: golang:1.23-bookworm go_version_script: go version test_script: go test $TEST_FLAG ./... @@ -14,7 +14,7 @@ test_bsd_task: env: ELVISH_TEST_TIME_SCALE: "20" TEST_FLAG: -race - GO_VERSION: "1.22.0" + GO_VERSION: "1.23.0" PATH: /usr/local/go/bin:$PATH matrix: - name: Test on FreeBSD @@ -31,19 +31,17 @@ test_bsd_task: # to run the tests and still reports tests as passing: # https://github.com/golang/go/issues/65425 sysctl kern.elf64.aslr.enable=0 + # NetBSD and FreeBSD images are from + # https://github.com/anarazel/pg-vm-images - name: Test on NetBSD compute_engine_instance: image_project: pg-ci-images - # Find latest version in the "VERSION:" variable for the NetBSD image in - # https://github.com/anarazel/pg-vm-images/blob/main/.cirrus.yml - image: family/pg-ci-netbsd-vanilla-9-3 + image: family/pg-ci-netbsd-vanilla platform: netbsd - name: Test on OpenBSD compute_engine_instance: image_project: pg-ci-images - # Find latest version in the "VERSION:" variable for the OpenBSD image in - # https://github.com/anarazel/pg-vm-images/blob/main/.cirrus.yml - image: family/pg-ci-openbsd-vanilla-7-3 + image: family/pg-ci-openbsd-vanilla platform: openbsd go_toolchain_cache: fingerprint_key: $CIRRUS_OS-$GO_VERSION @@ -64,7 +62,7 @@ build_binaries_task: container: # Keep the Go version part in sync with # https://github.com/elves/up/blob/master/Dockerfile - image: golang:1.22.0-alpine + image: golang:1.23.0-alpine go_modules_cache: fingerprint_script: cat go.sum folder: ~/go/pkg/mod diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4864bda3..95019ba4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,12 +19,12 @@ jobs: strategy: matrix: os: [ubuntu, macos, windows] - go-version: [1.22.x] + go-version: [1.23.x] go-version-is: [new] include: # Test old supported Go version - os: ubuntu - go-version: 1.21.x + go-version: 1.22.x go-version-is: [old] env: ELVISH_TEST_TIME_SCALE: 20 @@ -74,7 +74,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Test with emulator run: | go test ./... @@ -92,7 +92,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run benchmarks run: go test -bench=. -run='^$' ./... @@ -125,7 +125,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Set up Python uses: actions/setup-python@v5 with: @@ -149,7 +149,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/go.mod b/go.mod index 316c2d470..0387cd6b8 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ require ( github.com/google/go-cmp v0.6.0 github.com/mattn/go-isatty v0.0.20 github.com/sourcegraph/jsonrpc2 v0.2.0 - go.etcd.io/bbolt v1.3.9 - golang.org/x/sync v0.6.0 - golang.org/x/sys v0.17.0 + go.etcd.io/bbolt v1.3.10 + golang.org/x/sync v0.8.0 + golang.org/x/sys v0.24.0 pkg.nimblebun.works/go-lsp v1.1.0 ) -go 1.21 +go 1.22 diff --git a/go.sum b/go.sum index 26a8779cc..e21111ea0 100644 --- a/go.sum +++ b/go.sum @@ -14,13 +14,13 @@ github.com/sourcegraph/jsonrpc2 v0.2.0 h1:KjN/dC4fP6aN9030MZCJs9WQbTOjWHhrtKVpzz github.com/sourcegraph/jsonrpc2 v0.2.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= -go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= +go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= pkg.nimblebun.works/go-lsp v1.1.0 h1:TH5ro4p2vlDtELK4LoVeKs4TsKm6aW1f5WP8jHm/9m4= diff --git a/website/go.mod b/website/go.mod index 9e1ab56de..800ae767c 100644 --- a/website/go.mod +++ b/website/go.mod @@ -1,17 +1,17 @@ module src.elv.sh/website -go 1.21 +go 1.22 require ( - github.com/BurntSushi/toml v1.3.2 - github.com/creack/pty v1.1.21 - src.elv.sh v0.19.2 + github.com/BurntSushi/toml v1.4.0 + github.com/creack/pty v1.1.23 + src.elv.sh v0.21.0 ) require ( github.com/mattn/go-isatty v0.0.20 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect ) replace src.elv.sh => ../ diff --git a/website/go.sum b/website/go.sum index 10efc8ff8..94352e0ac 100644 --- a/website/go.sum +++ b/website/go.sum @@ -1,13 +1,13 @@ -github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= -github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0= -github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= +github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0= +github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=