Skip to content

Commit

Permalink
fix(stencil): upgrade modules (2023-10-23) (#289)
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 Oct 23, 2023
1 parent b4737e9 commit 7f6d880
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: 2.1
orbs:
shared: getoutreach/shared@dev:first
queue: eddiewebb/queue@1.8.4
queue: eddiewebb/queue@2.2.1

parameters:
rebuild_cache:
Expand Down
9 changes: 4 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<!--
!!!! README !!!! Please fill this out.
Please follow the PR naming conventions:
https://outreach-io.atlassian.net/wiki/spaces/EN/pages/1902444645/Conventional+Commits
Please follow conventional commit naming conventions:
https://www.conventionalcommits.org/en/v1.0.0/#summary
-->

Please read [CONTRIBUTING.md](CONTRIBUTING.md) for additional information on contributing to this repository!

<!-- A short description of what your PR does and what it solves. -->
## What this PR does / why we need it



<!-- <<Stencil::Block(jiraPrefix)>> -->

## Jira ID
Expand All @@ -22,8 +23,6 @@
<!-- Notes that may be helpful for anyone reviewing this PR -->
## Notes for your reviewers



<!-- <<Stencil::Block(custom)>> -->

<!-- <</Stencil::Block>> -->
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ Pulumi.*.yaml
# Documentation output
/apidocs

# Terraform lock files
.terraform.lock.hcl

### Start ignores inserted by other modules
### End ignores inserted by other modules

Expand Down
6 changes: 3 additions & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
# you are reducing compatibility guarantees.
## <<Stencil::Block(toolverOverride)>>
## <</Stencil::Block>>
nodejs 18.17.1
protoc 21.5
nodejs 18.14.1
golang 1.20.7
terraform 1.4.4
golang 1.20.8
# 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.
# The most common case is nodejs.
## <<Stencil::Block(toolver)>>
terraform 1.6.2
## <</Stencil::Block>>
10 changes: 5 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
"to": "/home/dev/app"
},
// Maps the go module cache on the host to the persistent volume used by devspaces.
// See the value of `go env GOMODCACHE` on the host and devspace.
// These should be the respective values of `go env GOMODCACHE`.
{
"from": "${env:HOME}/.asdf/installs/golang/1.20.7/packages/pkg/mod",
"to": "/tmp/cache/go/mod/"
"from": "${env:HOME}/.asdf/installs/golang/1.20.8/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.20.8/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.20.7/go/src",
"to": "/home/dev/.asdf/installs/golang/1.20.7/go/src"
"from": "${env:HOME}/.asdf/installs/golang/1.20.8/go/src",
"to": "/home/dev/.asdf/installs/golang/1.20.8/go/src"
}
]
},
Expand Down
5 changes: 0 additions & 5 deletions monitoring/slos.tf

This file was deleted.

12 changes: 3 additions & 9 deletions stencil.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1.36.0
version: v1.37.0
modules:
- name: github.com/getoutreach/devbase
url: https://github.com/getoutreach/devbase
Expand All @@ -8,10 +8,10 @@ modules:
version: v0.3.0
- name: github.com/getoutreach/stencil-base
url: https://github.com/getoutreach/stencil-base
version: v0.12.0
version: v0.14.0
- name: github.com/getoutreach/stencil-circleci
url: https://github.com/getoutreach/stencil-circleci
version: v1.10.0
version: v1.11.1
- name: github.com/getoutreach/stencil-golang
url: https://github.com/getoutreach/stencil-golang
version: unstable
Expand Down Expand Up @@ -67,18 +67,12 @@ files:
- name: .vscode/settings.json
template: .vscode/settings.json.tpl
module: github.com/getoutreach/stencil-golang
- name: CONTRIBUTING.md
template: CONTRIBUTING.md.tpl
module: github.com/getoutreach/stencil-base
- name: LICENSE
template: LICENSE.tpl
module: github.com/getoutreach/stencil-base
- name: Makefile
template: Makefile.tpl
module: github.com/getoutreach/stencil-golang
- name: README.md
template: README.md.tpl
module: github.com/getoutreach/stencil-base
- name: cmd/stencil/stencil.go
template: cmd/main_cli.go.tpl
module: github.com/getoutreach/stencil-golang
Expand Down

0 comments on commit 7f6d880

Please sign in to comment.