Skip to content

Commit 6e6d02d

Browse files
committed
update tools
1 parent bd9a04f commit 6e6d02d

File tree

5 files changed

+25
-17
lines changed

5 files changed

+25
-17
lines changed

Makefile

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ tidy:
1010
test: mocks tidy fmt helm-lint test-cover
1111
# Run coverage tests
1212
test-cover: ginkgo
13-
$(LOCALBIN)/ginkgo --cover ./...
13+
$(GINKGO) --cover ./...
1414

15-
release: semver
16-
@version=$$($(LOCALBIN)/semver); \
15+
release: goreleaser semver
16+
@version=$$($(SEMVER)); \
1717
git tag -s $$version -m"Release $$version"
18-
goreleaser --clean
18+
$(GORELEASER) --clean
1919

20-
test-release:
21-
goreleaser --skip-publish --snapshot --clean
20+
test-release: goreleaser
21+
$(GORELEASER) --skip=publish --snapshot --clean
2222

2323
mocks: mockgen
24-
$(LOCALBIN)/mockgen -destination pkg/mocks/core/mock.go --package core k8s.io/client-go/kubernetes/typed/core/v1 CoreV1Interface,SecretInterface
25-
$(LOCALBIN)/mockgen -destination pkg/mocks/ssclient/mock.go --package ssclient github.com/bitnami-labs/sealed-secrets/pkg/client/clientset/versioned/typed/sealedsecrets/v1alpha1 BitnamiV1alpha1Interface,SealedSecretInterface
26-
$(LOCALBIN)/mockgen -destination pkg/mocks/seal/mock.go --package seal github.com/bakito/sealed-secrets-web/pkg/seal Sealer
24+
$(MOCKGEN) -destination pkg/mocks/core/mock.go --package core k8s.io/client-go/kubernetes/typed/core/v1 CoreV1Interface,SecretInterface
25+
$(MOCKGEN) -destination pkg/mocks/ssclient/mock.go --package ssclient github.com/bitnami-labs/sealed-secrets/pkg/client/clientset/versioned/typed/sealedsecrets/v1alpha1 BitnamiV1alpha1Interface,SealedSecretInterface
26+
$(MOCKGEN) -destination pkg/mocks/seal/mock.go --package seal github.com/bakito/sealed-secrets-web/pkg/seal Sealer
2727

2828
## toolbox - start
2929
## Current working directory
@@ -37,15 +37,17 @@ $(LOCALBIN):
3737
SEMVER ?= $(LOCALBIN)/semver
3838
MOCKGEN ?= $(LOCALBIN)/mockgen
3939
GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
40+
GORELEASER ?= $(LOCALBIN)/goreleaser
4041
HELM_DOCS ?= $(LOCALBIN)/helm-docs
4142
GINKGO ?= $(LOCALBIN)/ginkgo
4243

4344
## Tool Versions
4445
SEMVER_VERSION ?= v1.1.3
4546
MOCKGEN_VERSION ?= v1.6.0
4647
GOLANGCI_LINT_VERSION ?= v1.54.2
47-
HELM_DOCS_VERSION ?= v1.11.0
48-
GINKGO_VERSION ?= v2.12.0
48+
GORELEASER_VERSION ?= v1.21.2
49+
HELM_DOCS_VERSION ?= v1.11.3
50+
GINKGO_VERSION ?= v2.13.0
4951

5052
## Tool Installer
5153
.PHONY: semver
@@ -60,6 +62,10 @@ $(MOCKGEN): $(LOCALBIN)
6062
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
6163
$(GOLANGCI_LINT): $(LOCALBIN)
6264
test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
65+
.PHONY: goreleaser
66+
goreleaser: $(GORELEASER) ## Download goreleaser locally if necessary.
67+
$(GORELEASER): $(LOCALBIN)
68+
test -s $(LOCALBIN)/goreleaser || GOBIN=$(LOCALBIN) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION)
6369
.PHONY: helm-docs
6470
helm-docs: $(HELM_DOCS) ## Download helm-docs locally if necessary.
6571
$(HELM_DOCS): $(LOCALBIN)
@@ -76,12 +82,14 @@ update-toolbox-tools:
7682
$(LOCALBIN)/semver \
7783
$(LOCALBIN)/mockgen \
7884
$(LOCALBIN)/golangci-lint \
85+
$(LOCALBIN)/goreleaser \
7986
$(LOCALBIN)/helm-docs \
8087
$(LOCALBIN)/ginkgo
8188
toolbox makefile -f $(LOCALDIR)/Makefile \
8289
github.com/bakito/semver \
8390
github.com/golang/mock/mockgen \
8491
github.com/golangci/golangci-lint/cmd/golangci-lint \
92+
github.com/goreleaser/goreleaser \
8593
github.com/norwoodj/helm-docs/cmd/helm-docs \
8694
github.com/onsi/ginkgo/v2/ginkgo
8795
## toolbox - end

chart/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v2
2-
appVersion: v3.1.2
2+
appVersion: v3.1.3
33
description: A web interface for Sealed Secrets by Bitnami.
44
home: https://github.com/bakito/sealed-secrets-web
55
icon: https://raw.githubusercontent.com/bakito/sealed-secrets-web/master/assets/logo.png
66
maintainers:
77
- name: bakito
88
url: https://github.com/bakito
99
name: sealed-secrets-web
10-
version: 3.1.2
10+
version: 3.1.3
1111
#annotations:
1212
# artifacthub.io/changes: |
1313
# - kind: added

chart/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# sealed-secrets-web
22

3-
![Version: 3.1.2](https://img.shields.io/badge/Version-3.1.2-informational?style=flat-square) ![AppVersion: v3.1.2](https://img.shields.io/badge/AppVersion-v3.1.2-informational?style=flat-square)
3+
![Version: 3.1.3](https://img.shields.io/badge/Version-3.1.3-informational?style=flat-square) ![AppVersion: v3.1.3](https://img.shields.io/badge/AppVersion-v3.1.3-informational?style=flat-square)
44

55
A web interface for Sealed Secrets by Bitnami.
66

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/gin-gonic/gin v1.9.1
88
github.com/golang/mock v1.6.0
99
github.com/google/uuid v1.3.1
10-
github.com/onsi/ginkgo/v2 v2.12.1
10+
github.com/onsi/ginkgo/v2 v2.13.0
1111
github.com/onsi/gomega v1.28.0
1212
gopkg.in/yaml.v3 v3.0.1
1313
k8s.io/api v0.28.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
9494
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
9595
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9696
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
97-
github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA=
98-
github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
97+
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
98+
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
9999
github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
100100
github.com/onsi/gomega v1.28.0/go.mod h1:A1H2JE76sI14WIP57LMKj7FVfCHx3g3BcZVjJG8bjX8=
101101
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=

0 commit comments

Comments
 (0)