Skip to content

Commit fd214f4

Browse files
fix(stencil): upgrade modules (2025-01-14) (#41)
Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com>
1 parent 196433d commit fd214f4

File tree

13 files changed

+937
-866
lines changed

13 files changed

+937
-866
lines changed

.circleci/config.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# syntax, such as anchors, will be fixed automatically.
33
version: 2.1
44
orbs:
5-
shared: getoutreach/shared@dev:2.28.2-rc.2
5+
shared: getoutreach/shared@dev:2.29.0-rc.8
66
queue: eddiewebb/[email protected]
77
## <<Stencil::Block(CircleCIExtraOrbs)>>
88

@@ -22,6 +22,7 @@ contexts: &contexts
2222
- ghaccesstoken
2323
- docker-registry
2424
- npm-credentials
25+
- box
2526
- vault-dev
2627
- confluence
2728
- circleci-credentials
@@ -45,6 +46,10 @@ test: &test
4546
release_branches: &release_branches
4647
- "main"
4748

49+
## <<Stencil::Block(circleAnchorExtra)>>
50+
51+
## <</Stencil::Block>>
52+
4853
jobs:
4954
{}
5055
## <<Stencil::Block(circleJobs)>>

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ updates:
1010
- dependency-name: github.com/getoutreach/gobox
1111
- dependency-name: github.com/getoutreach/stencil-golang/pkg
1212
- dependency-name: github.com/urfave/cli/v2
13+
- dependency-name: github.com/getoutreach/mint
1314
- dependency-name: github.com/getoutreach/services
1415
- dependency-name: github.com/getoutreach/datastores/v2
15-
- dependency-name: github.com/getoutreach/mint
1616
- dependency-name: github.com/getoutreach/httpx
1717

1818
# Ignore semantic-release, this code is only executed in CI.

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# you are reducing compatibility guarantees.
55
## <<Stencil::Block(toolverOverride)>>
66
## <</Stencil::Block>>
7-
golang 1.22.6
87
protoc 21.5
98
nodejs 20.16.0
109
terraform 1.5.7
10+
golang 1.23.4
1111
# Note: Versions in this block do not override the default versions above
1212
# but sometimes you have to declare additional versions of the same tool
1313
# while leaving the 'default' version intact for the infra.

.vscode/launch.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
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.22.6/packages/pkg/mod",
42-
"to": "/home/dev/.asdf/installs/golang/1.22.6/packages/pkg/mod"
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"
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.22.6/go/src",
48-
"to": "/home/dev/.asdf/installs/golang/1.22.6/go/src"
47+
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/go/src",
48+
"to": "/home/dev/.asdf/installs/golang/1.23.4/go/src"
4949
}
5050
]
5151
},

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"go.alternateTools": {
1313
"golangci-lint": "${workspaceFolder}/.bootstrap/shell/vscode/golang-linters.sh"
1414
},
15+
// This is disabled because it causes version mismatches between the
16+
// tools used/installed by asdf / stencil, and the ones updated by VSCode.
17+
// In particular, this is a problem with newer versions of golangci-lint
18+
// incompatible with older versions of Go.
19+
"go.toolsManagement.autoUpdate": false,
1520
"go.buildTags": "or_dev",
1621
"go.testTags": "or_test,or_int,or_e2e",
1722
"files.trimTrailingWhitespace": true,

cmd/ghaccesstoken/ghaccesstoken.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Outreach Corporation. All Rights Reserved.
1+
// Copyright 2025 Outreach Corporation. All Rights Reserved.
22

33
// Description: This file is the entrypoint for the ghaccesstoken CLI
44
// command for ci.

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/ci
4646
framework: stencil
4747
language: Golang
48-
stencil_version: v1.40.0-rc.1
49-
golang_version: 1.22.6
48+
stencil_version: v1.40.1-rc.2
49+
golang_version: 1.23.4
5050
cli: true
5151
service: false
5252
product: Outreach

go.mod

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,114 @@
11
module github.com/getoutreach/ci
22

3-
go 1.22
3+
go 1.23.0
44

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

77
require (
88
github.com/bradleyfalzon/ghinstallation v1.1.1
9-
github.com/getoutreach/gobox v1.90.2
9+
github.com/getoutreach/gobox v1.102.1
1010
github.com/google/go-github/v34 v34.0.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/sirupsen/logrus v1.9.3
13-
github.com/urfave/cli/v2 v2.27.2
13+
github.com/urfave/cli/v2 v2.27.4
1414
)
1515

1616
require (
1717
dario.cat/mergo v1.0.0 // indirect
18-
github.com/alecthomas/chroma/v2 v2.8.0 // indirect
18+
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
1919
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
20+
github.com/charmbracelet/lipgloss v0.13.0 // indirect
21+
github.com/charmbracelet/x/ansi v0.1.4 // indirect
2022
github.com/cloudflare/circl v1.3.7 // indirect
21-
github.com/creack/pty v1.1.21 // indirect
22-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
23+
github.com/creack/pty v1.1.23 // indirect
24+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
2325
github.com/fynelabs/selfupdate v0.2.0 // indirect
2426
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2527
github.com/google/go-github/v62 v62.0.0 // indirect
2628
github.com/google/uuid v1.6.0 // indirect
2729
github.com/json-iterator/go v1.1.12 // indirect
2830
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2931
github.com/modern-go/reflect2 v1.0.2 // indirect
32+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3033
github.com/pjbgf/sha1cd v0.3.0 // indirect
31-
github.com/skeema/knownhosts v1.2.2 // indirect
32-
golang.org/x/mod v0.17.0 // indirect
33-
golang.org/x/sync v0.7.0 // indirect
34-
golang.org/x/tools v0.21.0 // indirect
34+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
35+
github.com/skeema/knownhosts v1.3.0 // indirect
36+
golang.org/x/mod v0.20.0 // indirect
37+
golang.org/x/sync v0.10.0 // indirect
38+
golang.org/x/tools v0.24.0 // indirect
3539
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
3640
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
3741
)
3842

3943
require (
40-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
44+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
4145
github.com/Microsoft/go-winio v0.6.1 // indirect
42-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
46+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
4347
github.com/aymerick/douceur v0.2.0 // indirect
4448
github.com/beorn7/perks v1.0.1 // indirect
45-
github.com/briandowns/spinner v1.23.0 // indirect
49+
github.com/briandowns/spinner v1.23.1 // indirect
4650
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
47-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
48-
github.com/charmbracelet/glamour v0.7.0 // indirect
51+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
52+
github.com/charmbracelet/glamour v0.8.0 // indirect
4953
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
5054
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
51-
github.com/davecgh/go-spew v1.1.1 // indirect
55+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5256
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
53-
github.com/dlclark/regexp2 v1.4.0 // indirect
57+
github.com/dlclark/regexp2 v1.11.0 // indirect
5458
github.com/emirpasic/gods v1.18.1 // indirect
5559
github.com/fatih/color v1.17.0 // indirect
5660
github.com/felixge/httpsnoop v1.0.4 // indirect
5761
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
58-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
59-
github.com/go-git/go-git/v5 v5.12.0 // indirect
60-
github.com/go-logr/logr v1.4.1 // indirect
62+
github.com/go-git/go-billy/v5 v5.6.0 // indirect
63+
github.com/go-git/go-git/v5 v5.13.0 // indirect
64+
github.com/go-logr/logr v1.4.2 // indirect
6165
github.com/go-logr/stdr v1.2.2 // indirect
62-
github.com/golang/protobuf v1.5.3 // indirect
66+
github.com/golang/protobuf v1.5.4 // indirect
6367
github.com/google/go-github/v29 v29.0.2 // indirect
6468
github.com/google/go-querystring v1.1.0 // indirect
65-
github.com/gorilla/css v1.0.0 // indirect
69+
github.com/gorilla/css v1.0.1 // indirect
6670
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
67-
github.com/honeycombio/beeline-go v1.16.0 // indirect
71+
github.com/honeycombio/beeline-go v1.17.0 // indirect
6872
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
6973
github.com/kevinburke/ssh_config v1.2.0 // indirect
7074
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
7175
github.com/manifoldco/promptui v0.9.0 // indirect
7276
github.com/mattn/go-colorable v0.1.13 // indirect
7377
github.com/mattn/go-isatty v0.0.20 // indirect
7478
github.com/mattn/go-runewidth v0.0.15 // indirect
75-
github.com/microcosm-cc/bluemonday v1.0.25 // indirect
79+
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
7680
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
7781
github.com/muesli/reflow v0.3.0 // indirect
78-
github.com/muesli/termenv v0.15.2 // indirect
79-
github.com/olekukonko/tablewriter v0.0.5 // indirect
80-
github.com/prometheus/client_golang v1.19.1 // indirect
82+
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a // indirect
83+
github.com/prometheus/client_golang v1.20.2 // indirect
8184
github.com/prometheus/client_model v0.6.1 // indirect
82-
github.com/prometheus/common v0.48.0 // indirect
83-
github.com/prometheus/procfs v0.12.0 // indirect
85+
github.com/prometheus/common v0.55.0 // indirect
86+
github.com/prometheus/procfs v0.15.1 // indirect
8487
github.com/rivo/uniseg v0.4.7 // indirect
8588
github.com/russross/blackfriday/v2 v2.1.0 // indirect
86-
github.com/schollz/progressbar/v3 v3.14.2 // indirect
89+
github.com/schollz/progressbar/v3 v3.14.6 // indirect
8790
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
8891
github.com/ulikunitz/xz v0.5.12 // indirect
8992
github.com/xanzy/ssh-agent v0.3.3 // indirect
90-
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
91-
github.com/yuin/goldmark v1.5.4 // indirect
92-
github.com/yuin/goldmark-emoji v1.0.2 // indirect
93+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
94+
github.com/yuin/goldmark v1.7.4 // indirect
95+
github.com/yuin/goldmark-emoji v1.0.3 // indirect
9396
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
94-
go.opentelemetry.io/otel v1.26.0 // indirect
97+
go.opentelemetry.io/otel v1.29.0 // indirect
9598
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
9699
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
97-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
98-
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
99-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
100+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
101+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
102+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
100103
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
101-
golang.org/x/crypto v0.23.0 // indirect
102-
golang.org/x/net v0.25.0 // indirect
103-
golang.org/x/oauth2 v0.20.0 // indirect
104-
golang.org/x/sys v0.20.0 // indirect
105-
golang.org/x/term v0.20.0 // indirect
106-
golang.org/x/text v0.15.0 // indirect
104+
golang.org/x/crypto v0.31.0 // indirect
105+
golang.org/x/net v0.33.0 // indirect
106+
golang.org/x/oauth2 v0.22.0 // indirect
107+
golang.org/x/sys v0.28.0 // indirect
108+
golang.org/x/term v0.27.0 // indirect
109+
golang.org/x/text v0.21.0 // indirect
107110
google.golang.org/grpc v1.62.1 // indirect
108-
google.golang.org/protobuf v1.34.1 // indirect
111+
google.golang.org/protobuf v1.34.2 // indirect
109112
gopkg.in/warnings.v0 v0.1.2 // indirect
110113
gopkg.in/yaml.v3 v3.0.1 // indirect
111114
)

0 commit comments

Comments
 (0)