Skip to content

Commit

Permalink
Repo maintance:
Browse files Browse the repository at this point in the history
- clean up dependencies
- adding golangci lint
- updating maintaining teams
- allow release/** to build newer versions of consul-template going forward
  • Loading branch information
roncodingenthusiast committed Oct 4, 2023
1 parent a0c9082 commit 345188b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .release/ci.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@ schema = "1"

project "consul-template" {
// the team key is not used by CRT currently
team = "cat-floss"
team = "consul-core"
slack {
notification_channel = "C026W707YHJ"
notification_channel = "C9KPKPKRN"
}
github {
organization = "hashicorp"
repository = "consul-template"
release_branches = ["main"]
release_branches = [
"main",
"release/**",
]
}
}

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG PRODUCT_NAME=$BIN_NAME
# TARGETARCH and TARGETOS are set automatically when --platform is provided.
ARG TARGETOS TARGETARCH

LABEL maintainer="John Eikenberry <jae@zhar.net>"
LABEL maintainer="Consul Team <consul@hashicorp.com>"
# version label is required for build process
LABEL version=$PRODUCT_VERSION
LABEL revision=$PRODUCT_REVISION
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,9 @@ toc:
dev-tree:
@true
.PHONY: dev-tree

# lint
lint:
@echo "==> Running golangci-lint"
GOWORK=off golangci-lint run --build-tags '$(GOTAGS)'
.PHONY: lint
4 changes: 0 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,3 @@ require (
golang.org/x/time v0.3.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422

replace sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.5.1

0 comments on commit 345188b

Please sign in to comment.