From 4ead0413688f5c43df50cd8f78fcce32416b95ff Mon Sep 17 00:00:00 2001 From: Alexi Maschas Date: Wed, 22 Oct 2025 11:21:58 -0400 Subject: [PATCH 1/6] updating versions --- cli/module_generate/_templates/go/tmpl-go.mod | 2 +- etc/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/module_generate/_templates/go/tmpl-go.mod b/cli/module_generate/_templates/go/tmpl-go.mod index 4256aaa08eb..1ab32039065 100644 --- a/cli/module_generate/_templates/go/tmpl-go.mod +++ b/cli/module_generate/_templates/go/tmpl-go.mod @@ -1,3 +1,3 @@ module {{.ModuleLowercase}} -go 1.23 +go 1.25.1 diff --git a/etc/setup.sh b/etc/setup.sh index 6d1e1e10654..5d45ba1a24b 100755 --- a/etc/setup.sh +++ b/etc/setup.sh @@ -157,7 +157,7 @@ do_brew(){ tap "viamrobotics/brews" # pinned - brew "go@1.23", link: true, conflicts_with: ["go"] + brew "go@1.25.1", link: true, conflicts_with: ["go"] brew "node@18", link: true, conflicts_with: ["node"] # unpinned From cf9766111913bb42522269848d3d8fc2e75fec50 Mon Sep 17 00:00:00 2001 From: Alexi Maschas Date: Wed, 22 Oct 2025 11:25:38 -0400 Subject: [PATCH 2/6] one more --- etc/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/setup.sh b/etc/setup.sh index 5d45ba1a24b..5e995e5d177 100755 --- a/etc/setup.sh +++ b/etc/setup.sh @@ -177,7 +177,7 @@ do_brew(){ fi # replace default go with pinned - brew link --overwrite go@1.23 + brew link --overwrite go@1.25.1 # due to a missing bottle in homebrew, this has to be installed on its own brew install upx From ac12767b0e0c3a3373d413fbc1a0f512510d37a5 Mon Sep 17 00:00:00 2001 From: Alexi Maschas Date: Wed, 22 Oct 2025 13:18:17 -0400 Subject: [PATCH 3/6] updating version --- etc/.golangci.yaml | 7 ------- etc/setup.sh | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/etc/.golangci.yaml b/etc/.golangci.yaml index 3290f489e1b..085a9736ce6 100644 --- a/etc/.golangci.yaml +++ b/etc/.golangci.yaml @@ -12,13 +12,11 @@ linters: - canonicalheader - containedctx - contextcheck - - copyloopvar # TODO(go1.23): reenable in follow-up - cyclop - depguard - execinquery - exhaustruct - exportloopref - - fatcontext # TODO(go1.23): reenable in follow-up - forcetypeassert - funlen - gocognit @@ -33,7 +31,6 @@ linters: - importas - inamedparam - interfacebloat - - intrange # TODO(go1.23): reenable in follow-up - ireturn - maintidx - makezero @@ -41,18 +38,14 @@ linters: - musttag - nakedret - nestif - - nilnil # TODO(go1.23): low-pri to reenable - nlreturn - nonamedreturns - nosprintfhostport - paralleltest - perfsprint - prealloc - - predeclared # TODO(go1.23): reenable in follow-up - protogetter # TODO(go1.23): maybe reenable in the future but it's a big diff + buggy. - - spancheck # TODO(go1.23): reenable in follow-up - tagliatelle - - tenv # TODO(go1.23): reenable in follow-up - testpackage - thelper # false positives - varnamelen diff --git a/etc/setup.sh b/etc/setup.sh index 5e995e5d177..5507b95b9ce 100755 --- a/etc/setup.sh +++ b/etc/setup.sh @@ -157,7 +157,7 @@ do_brew(){ tap "viamrobotics/brews" # pinned - brew "go@1.25.1", link: true, conflicts_with: ["go"] + brew "go@1.25.3", link: true, conflicts_with: ["go"] brew "node@18", link: true, conflicts_with: ["node"] # unpinned @@ -177,7 +177,7 @@ do_brew(){ fi # replace default go with pinned - brew link --overwrite go@1.25.1 + brew link --overwrite go@1.25.3 # due to a missing bottle in homebrew, this has to be installed on its own brew install upx From a27048eee3c8b7cc0f0e2ea78368903799144fae Mon Sep 17 00:00:00 2001 From: Alexi Maschas Date: Wed, 22 Oct 2025 17:32:17 -0400 Subject: [PATCH 4/6] linter fixes --- rimage/filters.go | 5 +++++ rimage/image_file.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/rimage/filters.go b/rimage/filters.go index e4bf7a38d40..753aa875821 100644 --- a/rimage/filters.go +++ b/rimage/filters.go @@ -259,8 +259,13 @@ func savitskyGolayFilter(radius, polyOrder int) (func(p image.Point, dm *DepthMa // e.g. image.Point{0,2} -> a4*y^2, image.Point{1,1} -> a5*x*y. func polyExponents(order int) []image.Point { exps := make([]image.Point, 0, (order+1)*(order+2)/2) +<<<<<<< Updated upstream for k := 0; k < order+1; k++ { for n := 0; n < k+1; n++ { +======= + for k := range order + 1 { + for n := range k + 1 { +>>>>>>> Stashed changes exps = append(exps, image.Point{k - n, n}) } } diff --git a/rimage/image_file.go b/rimage/image_file.go index 867beaa6e9b..244c5593ecc 100644 --- a/rimage/image_file.go +++ b/rimage/image_file.go @@ -213,8 +213,13 @@ func ConvertImageSafe(img image.Image) (*Image, error) { case *image.NRGBA: fastConvertNRGBA(ii, orig) default: +<<<<<<< Updated upstream for y := 0; y < ii.height; y++ { for x := 0; x < ii.width; x++ { +======= + for y := range ii.height { + for x := range ii.width { +>>>>>>> Stashed changes ii.SetXY(x, y, NewColorFromColor(img.At(x, y))) } } From 906a40e8a771ec3b028ecc5cd81c9d960ddfd564 Mon Sep 17 00:00:00 2001 From: Alexi Maschas Date: Wed, 22 Oct 2025 17:32:43 -0400 Subject: [PATCH 5/6] reverting linter --- etc/.golangci.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/.golangci.yaml b/etc/.golangci.yaml index 085a9736ce6..3290f489e1b 100644 --- a/etc/.golangci.yaml +++ b/etc/.golangci.yaml @@ -12,11 +12,13 @@ linters: - canonicalheader - containedctx - contextcheck + - copyloopvar # TODO(go1.23): reenable in follow-up - cyclop - depguard - execinquery - exhaustruct - exportloopref + - fatcontext # TODO(go1.23): reenable in follow-up - forcetypeassert - funlen - gocognit @@ -31,6 +33,7 @@ linters: - importas - inamedparam - interfacebloat + - intrange # TODO(go1.23): reenable in follow-up - ireturn - maintidx - makezero @@ -38,14 +41,18 @@ linters: - musttag - nakedret - nestif + - nilnil # TODO(go1.23): low-pri to reenable - nlreturn - nonamedreturns - nosprintfhostport - paralleltest - perfsprint - prealloc + - predeclared # TODO(go1.23): reenable in follow-up - protogetter # TODO(go1.23): maybe reenable in the future but it's a big diff + buggy. + - spancheck # TODO(go1.23): reenable in follow-up - tagliatelle + - tenv # TODO(go1.23): reenable in follow-up - testpackage - thelper # false positives - varnamelen From 4bc74bfc378e64d08f27e4c7b4a4e63edfb2ad56 Mon Sep 17 00:00:00 2001 From: Alexi Maschas Date: Thu, 23 Oct 2025 12:55:55 -0400 Subject: [PATCH 6/6] reverting --- rimage/filters.go | 5 ----- rimage/image_file.go | 5 ----- 2 files changed, 10 deletions(-) diff --git a/rimage/filters.go b/rimage/filters.go index 753aa875821..e4bf7a38d40 100644 --- a/rimage/filters.go +++ b/rimage/filters.go @@ -259,13 +259,8 @@ func savitskyGolayFilter(radius, polyOrder int) (func(p image.Point, dm *DepthMa // e.g. image.Point{0,2} -> a4*y^2, image.Point{1,1} -> a5*x*y. func polyExponents(order int) []image.Point { exps := make([]image.Point, 0, (order+1)*(order+2)/2) -<<<<<<< Updated upstream for k := 0; k < order+1; k++ { for n := 0; n < k+1; n++ { -======= - for k := range order + 1 { - for n := range k + 1 { ->>>>>>> Stashed changes exps = append(exps, image.Point{k - n, n}) } } diff --git a/rimage/image_file.go b/rimage/image_file.go index 244c5593ecc..867beaa6e9b 100644 --- a/rimage/image_file.go +++ b/rimage/image_file.go @@ -213,13 +213,8 @@ func ConvertImageSafe(img image.Image) (*Image, error) { case *image.NRGBA: fastConvertNRGBA(ii, orig) default: -<<<<<<< Updated upstream for y := 0; y < ii.height; y++ { for x := 0; x < ii.width; x++ { -======= - for y := range ii.height { - for x := range ii.width { ->>>>>>> Stashed changes ii.SetXY(x, y, NewColorFromColor(img.At(x, y))) } }