Skip to content

Commit 59f3c9b

Browse files
fix(stencil): upgrade modules (2026-01-20) (#1052)
* build(deps): upgrade github.com/getoutreach/localizer from v1.15.17 to v1.15.18 --------- Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com> Co-authored-by: Mark Lee <mark.lee@outreach.io>
1 parent 2daf0cd commit 59f3c9b

13 files changed

Lines changed: 274 additions & 245 deletions

.editorconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@ insert_final_newline = true
88
[*.go,Makefile]
99
indent_style = tab
1010

11-
[*.{bash,rb,sh,slim,yml,yaml}]
11+
[*.{bash,json,rb,sh,slim,toml,yml,yaml}]
1212
indent_style = space
1313
indent_size = 2
1414

15+
[*.py]
16+
indent_style = space
17+
indent_size = 4
18+
19+
[*.md]
20+
trim_trailing_whitespace = false
21+
1522
## <<Stencil::Block(editorconfig)>>
1623
# Set for templates as well
1724
[*.go.tpl]

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*.dylib
77

88
# Editor files
9-
*.swp
9+
[._]*.sw[a-p]
1010
*~
1111
\#*\#
1212
.idea/*

.releaserc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ plugins:
1313

1414
# This creates fancy release notes in our Github release
1515
- "@semantic-release/release-notes-generator"
16+
1617
- "@semantic-release/github"
1718
- - "@semantic-release/exec"
1819
- prepareCmd: mise run orb:build

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## <</Stencil::Block>>
77
protoc 21.5
88
nodejs 20.16.0
9-
golang 1.23.4
9+
golang 1.25.6
1010
# Note: Versions in this block do not override the default versions above
1111
# but sometimes you have to declare additional versions of the same tool
1212
# while leaving the 'default' version intact for the infra.

.vscode/extensions.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"recommendations": [
3+
"DrBlury.protobuf-vsc",
34
"editorconfig.editorconfig",
45
"esbenp.prettier-vscode",
56
"hashicorp.terraform",
7+
"mads-hartmann.bash-ide-vscode",
68
"golang.go",
79
"Grafana.vscode-jsonnet",
8-
"timonwong.shellcheck",
9-
"zxh404.vscode-proto3",
1010
"redhat.vscode-yaml",
1111
"ms-azuretools.vscode-docker",
12-
"foxundermoon.shell-format",
1312

1413
// Please consider contributing back all recommended
1514
// extensions to stencil!

.vscode/launch.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"type": "go",
1010
"request": "launch",
1111
"mode": "debug",
12-
"envFile": "${workspaceRoot}/.vscode/private.env",
13-
"go.testEnvFile": "${workspaceRoot}/.vscode/private.env",
14-
"program": "${workspaceRoot}/cmd/devbase/",
12+
"envFile": "${workspaceFolder}/.vscode/private.env",
13+
"go.testEnvFile": "${workspaceFolder}/.vscode/private.env",
14+
"program": "${workspaceFolder}/cmd/devbase/",
1515
"buildFlags": "-tags=or_dev"
1616
},
1717
{
@@ -32,20 +32,20 @@
3232
// is compiled into the built binary. Note: This is not impacted by trimpath
3333
// because devbase currently uses dlv to compile the source code.
3434
// See: https://github.com/getoutreach/devbase/blob/main/shell/debug.sh#L72
35-
"from": "${workspaceRoot}",
35+
"from": "${workspaceFolder}",
3636
"to": "/home/dev/app"
3737
},
3838
// Maps the go module cache on the host to the persistent volume used by devspaces.
3939
// These should be the respective values of `go env GOMODCACHE`.
4040
{
41-
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/packages/pkg/mod",
42-
"to": "/home/dev/.asdf/installs/golang/1.23.4/packages/pkg/mod"
41+
"from": "${env:HOME}/.asdf/installs/golang/1.25.6/packages/pkg/mod",
42+
"to": "/home/dev/.asdf/installs/golang/1.25.6/packages/pkg/mod"
4343
},
4444
{
4545
// Maps the standard library location on the host to the location in the devspace.
4646
// This enables debugging standard library code.
47-
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/go/src",
48-
"to": "/home/dev/.asdf/installs/golang/1.23.4/go/src"
47+
"from": "${env:HOME}/.asdf/installs/golang/1.25.6/go/src",
48+
"to": "/home/dev/.asdf/installs/golang/1.25.6/go/src"
4949
}
5050
]
5151
},

.vscode/settings.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,25 @@
2222
"files.trimTrailingWhitespace": true,
2323
// This prevents 99% of issues with linters :)
2424
"editor.formatOnSave": true,
25-
"shellcheck.customArgs": ["-P", "SCRIPTDIR", "-x"],
26-
"shellformat.path": "./.bootstrap/shell/shfmt.sh",
25+
"bashIde.shellcheckPath": "./.bootstrap/shell/shellcheck.sh",
26+
"bashIde.shfmt.path": "./.bootstrap/shell/shfmt.sh",
2727
"[dockerfile]": {
2828
"editor.defaultFormatter": "ms-azuretools.vscode-docker"
2929
},
3030
"[markdown]": {
3131
"editor.defaultFormatter": "esbenp.prettier-vscode"
3232
},
3333
"[proto3]": {
34-
"editor.defaultFormatter": "zxh404.vscode-proto3"
34+
"editor.defaultFormatter": "DrBlury.protobuf-vsc"
3535
},
3636
"[yaml]": {
37-
"editor.defaultFormatter": "redhat.vscode-yaml"
37+
"editor.defaultFormatter": "esbenp.prettier-vscode"
3838
},
3939
"gopls": {
4040
"build.buildFlags": ["-tags=or_test,or_dev,or_e2e,or_int"]
4141
},
4242
"[terraform]": {
4343
"editor.defaultFormatter": "hashicorp.terraform"
4444
},
45-
"protoc": {
46-
"options": ["--proto_path=${workspaceRoot}/api"]
47-
}
45+
"protobuf.includes": ["${workspaceFolder}/api"]
4846
}

cortex.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ info:
4545
repo: https://github.com/getoutreach/devbase
4646
framework: stencil
4747
language: Golang
48-
stencil_version: v1.43.0-rc.8
49-
golang_version: 1.23.4
48+
stencil_version: v1.43.0
49+
golang_version: 1.25.6
5050
cli: false
5151
service: false
5252
product: Outreach

go.mod

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
module github.com/getoutreach/devbase/v2
22

3-
go 1.23.0
3+
go 1.25.0
44

5-
toolchain go1.23.4
5+
toolchain go1.25.6
66

77
require (
88
github.com/chainguard-dev/git-urls v1.0.2
9-
github.com/getoutreach/gobox v1.107.1
10-
github.com/getoutreach/localizer v1.15.17
9+
github.com/getoutreach/gobox v1.110.5
10+
github.com/getoutreach/localizer v1.15.18
1111
github.com/magefile/mage v1.15.0
1212
github.com/pkg/errors v0.9.1
1313
github.com/rs/zerolog v1.34.0
14-
google.golang.org/grpc v1.75.1
14+
google.golang.org/grpc v1.78.0
1515
gopkg.in/yaml.v2 v2.4.0
1616
gotest.tools/v3 v3.5.2
1717
)
1818

1919
require (
2020
al.essio.dev/pkg/shellescape v1.5.1 // indirect
21-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
21+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
2222
github.com/google/go-github/v71 v71.0.0
2323
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2424
)
2525

2626
require (
27-
dario.cat/mergo v1.0.1 // indirect
27+
dario.cat/mergo v1.0.2 // indirect
2828
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
2929
github.com/Microsoft/go-winio v0.6.2 // indirect
3030
github.com/ProtonMail/go-crypto v1.1.6 // indirect
@@ -38,15 +38,15 @@ require (
3838
github.com/felixge/httpsnoop v1.0.4 // indirect
3939
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
4040
github.com/go-git/go-billy/v5 v5.6.2 // indirect
41-
github.com/go-git/go-git/v5 v5.16.0 // indirect
41+
github.com/go-git/go-git/v5 v5.16.2 // indirect
4242
github.com/go-logr/logr v1.4.3 // indirect
4343
github.com/go-logr/stdr v1.2.2 // indirect
4444
github.com/godbus/dbus/v5 v5.1.0 // indirect
4545
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
4646
github.com/google/go-cmp v0.7.0 // indirect
4747
github.com/google/go-querystring v1.1.0 // indirect
4848
github.com/google/uuid v1.6.0 // indirect
49-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
49+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
5050
github.com/honeycombio/beeline-go v1.19.0 // indirect
5151
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
5252
github.com/json-iterator/go v1.1.12 // indirect
@@ -59,34 +59,35 @@ require (
5959
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6060
github.com/modern-go/reflect2 v1.0.2 // indirect
6161
github.com/pjbgf/sha1cd v0.3.2 // indirect
62-
github.com/prometheus/client_golang v1.22.0 // indirect
62+
github.com/prometheus/client_golang v1.23.2 // indirect
6363
github.com/prometheus/client_model v0.6.2 // indirect
64-
github.com/prometheus/common v0.62.0 // indirect
65-
github.com/prometheus/procfs v0.15.1 // indirect
64+
github.com/prometheus/common v0.67.5 // indirect
65+
github.com/prometheus/procfs v0.19.2 // indirect
6666
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
6767
github.com/sirupsen/logrus v1.9.3 // indirect
6868
github.com/skeema/knownhosts v1.3.1 // indirect
6969
github.com/xanzy/ssh-agent v0.3.3 // indirect
7070
github.com/zalando/go-keyring v0.2.6 // indirect
71-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
73-
go.opentelemetry.io/otel v1.37.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
77-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
78-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
79-
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
80-
golang.org/x/crypto v0.41.0 // indirect
81-
golang.org/x/net v0.42.0 // indirect
82-
golang.org/x/oauth2 v0.30.0 // indirect
83-
golang.org/x/sync v0.16.0 // indirect
84-
golang.org/x/sys v0.35.0 // indirect
85-
golang.org/x/term v0.34.0 // indirect
86-
golang.org/x/text v0.28.0 // indirect
87-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
88-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
89-
google.golang.org/protobuf v1.36.8 // indirect
71+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
72+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
73+
go.opentelemetry.io/otel v1.39.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
75+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
76+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
77+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
78+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
79+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
80+
go.yaml.in/yaml/v2 v2.4.3 // indirect
81+
golang.org/x/crypto v0.47.0 // indirect
82+
golang.org/x/net v0.49.0 // indirect
83+
golang.org/x/oauth2 v0.34.0 // indirect
84+
golang.org/x/sync v0.19.0 // indirect
85+
golang.org/x/sys v0.40.0 // indirect
86+
golang.org/x/term v0.39.0 // indirect
87+
golang.org/x/text v0.33.0 // indirect
88+
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
89+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect
90+
google.golang.org/protobuf v1.36.11 // indirect
9091
gopkg.in/warnings.v0 v0.1.2 // indirect
9192
gopkg.in/yaml.v3 v3.0.1 // indirect
9293
)

0 commit comments

Comments
 (0)