Skip to content

Commit

Permalink
fix(stencil): upgrade modules (2025-02-14) (#386)
Browse files Browse the repository at this point in the history
Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com>
  • Loading branch information
getoutreach-ci-1[bot] authored Feb 18, 2025
1 parent 31b863a commit a22560a
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 217 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# syntax, such as anchors, will be fixed automatically.
version: 2.1
orbs:
shared: getoutreach/shared@dev:2.29.0-rc.8
shared: getoutreach/[email protected]
queue: eddiewebb/[email protected]
## <<Stencil::Block(CircleCIExtraOrbs)>>

Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
"go.alternateTools": {
"golangci-lint": "${workspaceFolder}/.bootstrap/shell/vscode/golang-linters.sh"
},
// This is disabled because it causes version mismatches between the
// tools used/installed by asdf / stencil, and the ones updated by VSCode.
// In particular, this is a problem with newer versions of golangci-lint
// incompatible with older versions of Go.
"go.toolsManagement.autoUpdate": false,
"go.buildTags": "or_dev",
"go.testTags": "or_test,or_int,or_e2e",
"files.trimTrailingWhitespace": true,
Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/stencil.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 Outreach Corporation. All Rights Reserved.
// Copyright 2025 Outreach Corporation. All Rights Reserved.

// Description: This file is the entrypoint for the stencil CLI
// command for stencil.
Expand Down
2 changes: 1 addition & 1 deletion cortex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ info:
repo: https://github.com/getoutreach/stencil
framework: stencil
language: Golang
stencil_version: v1.40.1-rc.1
stencil_version: v1.40.1-rc.2
golang_version: 1.23.4
cli: true
service: false
Expand Down
19 changes: 10 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/chainguard-dev/git-urls v1.0.2
github.com/charmbracelet/glamour v0.8.0
github.com/davecgh/go-spew v1.1.1
github.com/getoutreach/gobox v1.95.0
github.com/getoutreach/gobox v1.102.1
github.com/go-git/go-billy/v5 v5.6.2
github.com/go-git/go-git/v5 v5.13.2
github.com/google/go-cmp v0.6.0
Expand All @@ -35,6 +35,7 @@ require (
require (
github.com/fynelabs/selfupdate v0.2.0 // indirect
github.com/google/go-github/v62 v62.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
)
Expand All @@ -51,8 +52,8 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/briandowns/spinner v1.23.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/charmbracelet/lipgloss v0.12.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/lipgloss v0.13.0 // indirect
github.com/charmbracelet/x/ansi v0.1.4 // indirect
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
github.com/cloudflare/circl v1.3.7 // indirect
Expand Down Expand Up @@ -100,10 +101,10 @@ require (
github.com/oklog/run v1.0.0 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_golang v1.20.2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/schollz/progressbar/v3 v3.14.6 // indirect
Expand All @@ -118,12 +119,12 @@ require (
github.com/yuin/goldmark-emoji v1.0.3 // indirect
github.com/zalando/go-keyring v0.2.5 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/mod v0.20.0 // indirect
Expand Down
44 changes: 24 additions & 20 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions scripts/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ linters:
- whitespace

issues:
max-same-issues: 10
exclude:
# We allow error shadowing
- 'declaration of "err" shadows declaration at'
Expand Down
10 changes: 5 additions & 5 deletions stencil.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
version: v1.40.1-rc.1
version: v1.40.1-rc.2
modules:
- name: github.com/getoutreach/devbase
url: https://github.com/getoutreach/devbase
version: v2.29.0-rc.8
version: v2.29.0
- name: github.com/getoutreach/stencil-actions
url: https://github.com/getoutreach/stencil-actions
version: v0.4.4-rc.1
version: v0.4.4
- name: github.com/getoutreach/stencil-base
url: https://github.com/getoutreach/stencil-base
version: v0.16.3-rc.1
version: v0.16.3
- name: github.com/getoutreach/stencil-circleci
url: https://github.com/getoutreach/stencil-circleci
version: v1.15.0-rc.1
version: v1.15.0
- name: github.com/getoutreach/stencil-golang
url: https://github.com/getoutreach/stencil-golang
version: unstable
Expand Down
Loading

0 comments on commit a22560a

Please sign in to comment.