Skip to content

Commit ed007de

Browse files
myziemyzie
authored
Update deps for all modules (deepnoodle-ai#258)
1 parent ea6332b commit ed007de

File tree

42 files changed

+905
-989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+905
-989
lines changed

‎.circleci/config.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
test:
88
working_directory: ~/repo
99
docker:
10-
- image: cimg/go:1.22
10+
- image: golang:1.23.0
1111
resource_class: large
1212
steps:
1313
- checkout
@@ -27,6 +27,7 @@ jobs:
2727
- run:
2828
name: Run tests
2929
command: |
30+
go install gotest.tools/gotestsum@latest
3031
mkdir -p /tmp/test-reports
3132
make test
3233
- codecov/upload
@@ -35,14 +36,18 @@ jobs:
3536
generate:
3637
working_directory: ~/repo
3738
docker:
38-
- image: cimg/go:1.22
39+
- image: golang:1.23.0
3940
resource_class: small
4041
steps:
4142
- checkout
4243
# No save_cache, as the "tests" job already does that.
4344
- restore_cache:
4445
keys:
4546
- go-mod-v6-{{ checksum "go.sum" }}
47+
- run:
48+
name: Install gofumpt
49+
command: |
50+
go install mvdan.cc/gofumpt@latest
4651
- run:
4752
name: Run generate
4853
command: |
@@ -51,7 +56,7 @@ jobs:
5156
format:
5257
working_directory: ~/repo
5358
docker:
54-
- image: cimg/go:1.22
59+
- image: golang:1.23.0
5560
resource_class: small
5661
steps:
5762
- checkout

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ release:
6767
.PHONY: generate
6868
generate:
6969
go generate
70+
gofumpt -l -w .
7071

7172
# Use entr to watch for changes to markdown files and copy them to the
7273
# risor-site repo (expected to be at ../risor-site). You can brew install entr.

‎cmd/risor-api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.22.0
77
replace github.com/risor-io/risor => ../..
88

99
require (
10-
github.com/go-chi/chi/v5 v5.0.12
10+
github.com/go-chi/chi/v5 v5.1.0
1111
github.com/risor-io/risor v1.6.0
1212
github.com/stretchr/testify v1.9.0
1313
)

‎cmd/risor-api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
22
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
33
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
5-
github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
4+
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
5+
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
66
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
77
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
88
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

‎cmd/risor-lsp/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ replace github.com/risor-io/risor => ../..
99
require (
1010
github.com/jdbaldry/go-language-server-protocol v0.0.0-20211013214444-3022da0884b2
1111
github.com/risor-io/risor v1.6.0
12-
github.com/rs/zerolog v1.32.0
12+
github.com/rs/zerolog v1.33.0
1313
)
1414

1515
require (
1616
github.com/mattn/go-colorable v0.1.13 // indirect
1717
github.com/mattn/go-isatty v0.0.20 // indirect
18-
golang.org/x/sys v0.19.0 // indirect
19-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
18+
golang.org/x/sys v0.24.0 // indirect
19+
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
2020
)

‎cmd/risor-lsp/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
1414
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
1515
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1616
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
17-
github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
18-
github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
17+
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
18+
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
1919
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
2020
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
2121
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2222
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2323
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
24-
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
25-
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
26-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
27-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
24+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
25+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
26+
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk=
27+
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
2828
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2929
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎cmd/risor-modgen/go.mod

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
module github.com/risor-io/risor/cmd/risor-modgen
22

3-
go 1.21
3+
go 1.22
44

5-
require mvdan.cc/gofumpt v0.6.0
6-
7-
require (
8-
github.com/google/go-cmp v0.6.0 // indirect
9-
golang.org/x/mod v0.17.0 // indirect
10-
golang.org/x/tools v0.19.0 // indirect
11-
)
5+
toolchain go1.22.2

‎cmd/risor-modgen/go.sum

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +0,0 @@
1-
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
2-
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
3-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
5-
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
6-
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
7-
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
8-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
9-
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
10-
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
11-
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
12-
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
13-
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
14-
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
15-
mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo=
16-
mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA=

‎cmd/risor-modgen/main.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ import (
1414
"os"
1515
"path/filepath"
1616
"regexp"
17-
"runtime/debug"
1817
"slices"
1918
"strings"
2019
"text/template"
21-
22-
"mvdan.cc/gofumpt/format"
2320
)
2421

2522
const (
@@ -141,23 +138,7 @@ func Parse(fset *token.FileSet, pkg *ast.Package) (*Module, error) {
141138
func (m *Module) WriteFile(path string, options Options) (bool, int, error) {
142139
var buf bytes.Buffer
143140
m.Fprint(&buf, options)
144-
145-
fmtOpts := format.Options{
146-
ModulePath: filepath.Dir(path),
147-
}
148-
149-
if dbg, ok := debug.ReadBuildInfo(); ok {
150-
// turn "go1.19.2" into "1.19.2"
151-
fmtOpts.LangVersion = strings.TrimPrefix(dbg.GoVersion, "go")
152-
}
153-
154-
// Format using gofumpt
155-
b, err := format.Source(buf.Bytes(), fmtOpts)
156-
if err != nil {
157-
return false, 0, fmt.Errorf("format file %q: %w", path, err)
158-
}
159-
160-
return writeFileCheckChanged(path, b)
141+
return writeFileCheckChanged(path, buf.Bytes())
161142
}
162143

163144
func writeFileCheckChanged(path string, b []byte) (bool, int, error) {

0 commit comments

Comments
 (0)