Skip to content

Commit

Permalink
fix(stencil): upgrade modules (2025-01-13) (#79)
Browse files Browse the repository at this point in the history
This PR contains the following updates:

| Module | Change |
|--------|--------|
|
[github.com/getoutreach/devbase](https://github.com/getoutreach/devbase)
| `v2.28.2-rc.2` -> `v2.29.0-rc.8` |
|
[github.com/getoutreach/stencil-actions](https://github.com/getoutreach/stencil-actions)
| `v0.4.3-rc.3` -> `v0.4.4-rc.1` |
|
[github.com/getoutreach/stencil-base](https://github.com/getoutreach/stencil-base)
| `v0.16.2-rc.1` -> `v0.16.3-rc.1` |
|
[github.com/getoutreach/stencil-circleci](https://github.com/getoutreach/stencil-circleci)
| `v1.14.0` -> `v1.15.0-rc.1` |
|
[github.com/getoutreach/stencil-discovery](https://github.com/getoutreach/stencil-discovery)
| `v1.8.6-rc.1` -> `v1.8.7-rc.1` |
|
[github.com/getoutreach/stencil-golang](https://github.com/getoutreach/stencil-golang)
| `v1.24.1-rc.2` -> `v1.25.0-rc.9` |

---

### Release Notes
<details>
<summary>github.com/getoutreach/devbase</summary>
<a
href="https://github.com/getoutreach/devbase/compare/v2.28.2-rc.2...v2.29.0-rc.8">Changes</a>
</details>
<details>
<summary>github.com/getoutreach/stencil-actions</summary>
<a
href="https://github.com/getoutreach/stencil-actions/compare/v0.4.3-rc.3...v0.4.4-rc.1">Changes</a>
</details>
<details>
<summary>github.com/getoutreach/stencil-base</summary>
<a
href="https://github.com/getoutreach/stencil-base/compare/v0.16.2-rc.1...v0.16.3-rc.1">Changes</a>
</details>
<details>
<summary>github.com/getoutreach/stencil-circleci</summary>
<a
href="https://github.com/getoutreach/stencil-circleci/compare/v1.14.0...v1.15.0-rc.1">Changes</a>
</details>
<details>
<summary>github.com/getoutreach/stencil-discovery</summary>
<a
href="https://github.com/getoutreach/stencil-discovery/compare/v1.8.6-rc.1...v1.8.7-rc.1">Changes</a>
</details>
<details>
<summary>github.com/getoutreach/stencil-golang</summary>
<a
href="https://github.com/getoutreach/stencil-golang/compare/v1.24.1-rc.2...v1.25.0-rc.9">Changes</a>
</details>

---

This PR was generated by
[stencilbot](https://github.com/getoutreach/dtss-tools).
Feedback/Questions? Reach out to us on
[Slack](https://outreach-hq.slack.com/archives/CN9MU7GLW).

<details>
<summary>Metadata</summary>
<b>Stencil Version</b>: <code>v1.40.1-rc.2</code>
</details>

---------

Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com>
Co-authored-by: Mark Lee <[email protected]>
  • Loading branch information
getoutreach-ci-1[bot] and malept authored Jan 14, 2025
1 parent 0437517 commit aeda31b
Show file tree
Hide file tree
Showing 19 changed files with 803 additions and 716 deletions.
7 changes: 6 additions & 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.28.2-rc.2
shared: getoutreach/shared@dev:2.29.0-rc.8
queue: eddiewebb/[email protected]
## <<Stencil::Block(CircleCIExtraOrbs)>>

Expand All @@ -20,6 +20,7 @@ parameters:
contexts: &contexts
- aws-credentials
- npm-credentials
- box
- vault-dev
- confluence
- circleci-credentials
Expand All @@ -44,6 +45,10 @@ test: &test
release_branches: &release_branches
- "main"

## <<Stencil::Block(circleAnchorExtra)>>

## <</Stencil::Block>>

jobs:
{}
## <<Stencil::Block(circleJobs)>>
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# you are reducing compatibility guarantees.
## <<Stencil::Block(toolverOverride)>>
## <</Stencil::Block>>
golang 1.22.6
protoc 21.5
nodejs 20.16.0
golang 1.23.4
# Note: Versions in this block do not override the default versions above
# but sometimes you have to declare additional versions of the same tool
# while leaving the 'default' version intact for the infra.
Expand Down
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
// Maps the go module cache on the host to the persistent volume used by devspaces.
// These should be the respective values of `go env GOMODCACHE`.
{
"from": "${env:HOME}/.asdf/installs/golang/1.22.6/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.22.6/packages/pkg/mod"
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.23.4/packages/pkg/mod"
},
{
// Maps the standard library location on the host to the location in the devspace.
// This enables debugging standard library code.
"from": "${env:HOME}/.asdf/installs/golang/1.22.6/go/src",
"to": "/home/dev/.asdf/installs/golang/1.22.6/go/src"
"from": "${env:HOME}/.asdf/installs/golang/1.23.4/go/src",
"to": "/home/dev/.asdf/installs/golang/1.23.4/go/src"
}
]
},
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
6 changes: 3 additions & 3 deletions actions/brokenbranch/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/getoutreach/actions/pkg/gh"
"github.com/getoutreach/actions/pkg/slack"
"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
actions "github.com/sethvargo/go-githubactions"
_slack "github.com/slack-go/slack"
Expand Down Expand Up @@ -70,7 +70,7 @@ func main() {
}

if err := RunAction(ctx, client, ghContext); err != nil {
actions.Errorf(err.Error())
actions.Errorf("%s", err.Error())
return
}
exitCode = 0
Expand Down Expand Up @@ -168,7 +168,7 @@ func RunAction(ctx context.Context, _ *github.Client, actionCtx *actions.GitHubC
if dmCommitterErr != nil {
// append to channel message
appendToChannelMessage = fmt.Sprintf(`
:warning: *Was unable to DM the committer* due to error: %s`, dmCommitterErr.Error())
}

Expand Down
4 changes: 2 additions & 2 deletions actions/commitguard/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/getoutreach/actions/pkg/gh"
"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
actions "github.com/sethvargo/go-githubactions"
)
Expand Down Expand Up @@ -64,7 +64,7 @@ func main() {
}

if err := RunAction(ctx, client, ghContext); err != nil {
actions.Errorf(err.Error())
actions.Errorf("%s", err.Error())
return
}
exitCode = 0
Expand Down
4 changes: 2 additions & 2 deletions actions/conventional_commit/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/getoutreach/actions/pkg/gh"
"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
actions "github.com/sethvargo/go-githubactions"
)
Expand Down Expand Up @@ -89,7 +89,7 @@ func main() {
}

if err := RunAction(ctx, client, ghContext); err != nil {
actions.Errorf(err.Error())
actions.Errorf("%s", err.Error())
return
}
exitCode = 0
Expand Down
20 changes: 10 additions & 10 deletions actions/conventional_commit/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"testing"

"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"gotest.tools/v3/assert"
)

Expand All @@ -26,10 +26,10 @@ func Test_allowBypass(t *testing.T) {
commit: &github.RepositoryCommit{
Commit: &github.Commit{
Author: &github.CommitAuthor{
Email: github.String("49699333+dependabot[bot]@users.noreply.github.com"),
Email: github.Ptr("49699333+dependabot[bot]@users.noreply.github.com"),
},
Verification: &github.SignatureVerification{
Verified: github.Bool(true),
Verified: github.Ptr(true),
},
},
},
Expand All @@ -42,10 +42,10 @@ func Test_allowBypass(t *testing.T) {
commit: &github.RepositoryCommit{
Commit: &github.Commit{
Author: &github.CommitAuthor{
Email: github.String("[email protected]"),
Email: github.Ptr("[email protected]"),
},
Verification: &github.SignatureVerification{
Verified: github.Bool(true),
Verified: github.Ptr(true),
},
},
},
Expand All @@ -57,12 +57,12 @@ func Test_allowBypass(t *testing.T) {
args: args{
commit: &github.RepositoryCommit{
Commit: &github.Commit{
SHA: github.String("1234"),
SHA: github.Ptr("1234"),
Author: &github.CommitAuthor{
Email: github.String("49699333+dependabot[bot]@users.noreply.github.com"),
Email: github.Ptr("49699333+dependabot[bot]@users.noreply.github.com"),
},
Verification: &github.SignatureVerification{
Verified: github.Bool(false),
Verified: github.Ptr(false),
},
},
},
Expand All @@ -75,10 +75,10 @@ func Test_allowBypass(t *testing.T) {
commit: &github.RepositoryCommit{
Commit: &github.Commit{
Author: &github.CommitAuthor{
Email: github.String("[email protected]"),
Email: github.Ptr("[email protected]"),
},
Verification: &github.SignatureVerification{
Verified: github.Bool(true),
Verified: github.Ptr(true),
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions cortex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ info:
repo: https://github.com/getoutreach/actions
framework: stencil
language: Golang
stencil_version: v1.40.0-rc.1
golang_version: 1.22.6
stencil_version: v1.40.1-rc.2
golang_version: 1.23.4
cli: false
service: false
product: Outreach
Expand Down
17 changes: 7 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
module github.com/getoutreach/actions

go 1.22
go 1.23.0

toolchain go1.22.6
toolchain go1.23.4

require (
github.com/bradleyfalzon/ghinstallation/v2 v2.12.0
github.com/bradleyfalzon/ghinstallation/v2 v2.13.0
github.com/getoutreach/goql v1.13.0
github.com/google/go-github/v43 v43.0.0
github.com/google/go-github/v68 v68.0.0
github.com/pkg/errors v0.9.1
github.com/sethvargo/go-githubactions v1.3.0
github.com/slack-go/slack v0.15.0
golang.org/x/oauth2 v0.24.0
golang.org/x/oauth2 v0.25.0
gotest.tools/v3 v3.5.1
)

require (
github.com/getoutreach/gobox v1.90.2 // indirect
github.com/getoutreach/gobox v1.102.1 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github/v66 v66.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/stretchr/testify v1.10.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
)
23 changes: 10 additions & 13 deletions go.sum

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

2 changes: 1 addition & 1 deletion pkg/gh/gh.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"strings"

"github.com/bradleyfalzon/ghinstallation/v2"
"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/gh/pulls.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package gh
import (
"context"

"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/gh/saml.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"context"

"github.com/getoutreach/goql"
"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion scripts/devbase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
libDir="$DIR/../.bootstrap"
lockfile="$DIR/../stencil.lock"
serviceYaml="$DIR/../service.yaml"
gojqVersion="v0.12.14"
gojqVersion="v0.12.16"

# get_absolute_path returns the absolute path of a file
get_absolute_path() {
Expand Down
13 changes: 6 additions & 7 deletions scripts/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ linters-settings:
errcheck:
check-blank: true
govet:
check-shadowing: true
enable:
- shadow
revive:
rules:
# Enable the default golint rules. We must include these because
Expand Down Expand Up @@ -56,10 +57,6 @@ linters-settings:
- style
disabled-checks:
- whyNoLint # Doesn't seem to work properly
# Suggests bad simplifications (After is not identical to !Before).
# TODO(jkinkead): Remove when we have a version of go-critic with
# https://github.com/go-critic/go-critic/pull/1281 merged.
- timeCmpSimplify
funlen:
lines: 500
statements: 50
Expand All @@ -69,11 +66,11 @@ linters:
disable-all: true
enable:
- bodyclose
- copyloopvar # Detects places where loop variables are copied.
- dogsled
- errcheck
- errorlint
- exhaustive # Checks exhaustiveness of enum switch statements.
- exportloopref # Checks for pointers to enclosing loop variables.
- funlen
- gochecknoinits
- goconst
Expand Down Expand Up @@ -126,6 +123,8 @@ issues:
source: "^//go:generate "

output:
format: colored-line-number
formats:
- format: colored-line-number
path: stdout
sort-results: true
print-severity: true
2 changes: 1 addition & 1 deletion scripts/new-action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import (
"time"
"github.com/getoutreach/actions/pkg/gh"
"github.com/google/go-github/v43/github"
"github.com/google/go-github/v68/github"
"github.com/pkg/errors"
actions "github.com/sethvargo/go-githubactions"
)
Expand Down
Loading

0 comments on commit aeda31b

Please sign in to comment.