forked from tektoncd/triggers
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump Pipeline, k8s, and Knative dependencies
This change uses non-tagged commits from `knative.dev/serving` and `knative.dev/eventing` because their `v0.31.0` releases require a minimum k8s cluster version of 1.22, and I wanted to avoid requiring that if at all possible. Instead, we depend on the latest commit in each before they changed to depending on a `knative.dev/pkg` commit newer than the one Pipeline depends on. Also add a Makefile, sync `.golangci.yml` with Pipeline's (other than requiring comments for exported functions/types/etc, which I'll come back and do in a followup), and fix some new-as-a-result linter issues. Signed-off-by: Andrew Bayer <[email protected]>
- Loading branch information
1 parent
693f951
commit 7146397
Showing
819 changed files
with
60,754 additions
and
8,827 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,200 @@ | ||
| MODULE = $(shell env GO111MODULE=on $(GO) list -m) | ||
| DATE ?= $(shell date +%FT%T%z) | ||
| VERSION ?= $(shell git describe --tags --always --dirty --match=v* 2> /dev/null || \ | ||
| cat $(CURDIR)/.version 2> /dev/null || echo v0) | ||
| PKGS = $(or $(PKG),$(shell env GO111MODULE=on $(GO) list ./... | grep -v 'github\.com\/tektoncd\/triggers\/third_party\/')) | ||
| TESTPKGS = $(shell env GO111MODULE=on $(GO) list -f \ | ||
| '{{ if or .TestGoFiles .XTestGoFiles }}{{ .ImportPath }}{{ end }}' \ | ||
| $(PKGS)) | ||
| BIN = $(CURDIR)/.bin | ||
|
|
||
| GOLANGCI_VERSION = v1.42.0 | ||
|
|
||
| GO = go | ||
| TIMEOUT_UNIT = 5m | ||
| TIMEOUT_E2E = 20m | ||
| V = 0 | ||
| Q = $(if $(filter 1,$V),,@) | ||
| M = $(shell printf "\033[34;1m🐱\033[0m") | ||
|
|
||
| export GO111MODULE=on | ||
|
|
||
| COMMANDS=$(patsubst cmd/%,%,$(wildcard cmd/*)) | ||
| BINARIES=$(addprefix bin/,$(COMMANDS)) | ||
|
|
||
| .PHONY: all | ||
| all: fmt $(BINARIES) | $(BIN) ; $(info $(M) building executable…) @ ## Build program binary | ||
|
|
||
| $(BIN): | ||
| @mkdir -p $@ | ||
| $(BIN)/%: | $(BIN) ; $(info $(M) building $(PACKAGE)…) | ||
| $Q tmp=$$(mktemp -d); \ | ||
| env GO111MODULE=off GOPATH=$$tmp GOBIN=$(BIN) $(GO) get $(PACKAGE) \ | ||
| || ret=$$?; \ | ||
| rm -rf $$tmp ; exit $$ret | ||
|
|
||
| FORCE: | ||
|
|
||
| bin/%: cmd/% FORCE | ||
| $Q $(GO) build -mod=vendor $(LDFLAGS) -v -o $@ ./$< | ||
|
|
||
| .PHONY: cross | ||
| cross: amd64 arm arm64 s390x ppc64le ## build cross platform binaries | ||
|
|
||
| .PHONY: amd64 | ||
| amd64: | ||
| GOOS=linux GOARCH=amd64 go build -mod=vendor $(LDFLAGS) ./cmd/... | ||
|
|
||
| .PHONY: arm | ||
| arm: | ||
| GOOS=linux GOARCH=arm go build -mod=vendor $(LDFLAGS) ./cmd/... | ||
|
|
||
| .PHONY: arm64 | ||
| arm64: | ||
| GOOS=linux GOARCH=arm64 go build -mod=vendor $(LDFLAGS) ./cmd/... | ||
|
|
||
| .PHONY: s390x | ||
| s390x: | ||
| GOOS=linux GOARCH=s390x go build -mod=vendor $(LDFLAGS) ./cmd/... | ||
|
|
||
| .PHONY: ppc64le | ||
| ppc64le: | ||
| GOOS=linux GOARCH=ppc64le go build -mod=vendor $(LDFLAGS) ./cmd/... | ||
|
|
||
| KO = $(or ${KO_BIN},${KO_BIN},$(BIN)/ko) | ||
| $(BIN)/ko: PACKAGE=github.com/google/ko | ||
|
|
||
| .PHONY: apply | ||
| apply: | $(KO) ; $(info $(M) ko apply -R -f config/) @ ## Apply config to the current cluster | ||
| $Q $(KO) apply -R -f config | ||
|
|
||
| .PHONY: resolve | ||
| resolve: | $(KO) ; $(info $(M) ko resolve -R -f config/) @ ## Resolve config to the current cluster | ||
| $Q $(KO) resolve --push=false --oci-layout-path=$(BIN)/oci -R -f config | ||
|
|
||
| .PHONY: generated | ||
| generated: | vendor ; $(info $(M) update generated files) ## Update generated files | ||
| $Q ./hack/update-codegen.sh | ||
|
|
||
| .PHONY: vendor | ||
| vendor: | ||
| $Q ./hack/update-deps.sh | ||
|
|
||
| ## Tests | ||
| TEST_UNIT_TARGETS := test-unit-verbose test-unit-race | ||
| test-unit-verbose: ARGS=-v | ||
| test-unit-race: ARGS=-race | ||
| $(TEST_UNIT_TARGETS): test-unit | ||
| .PHONY: $(TEST_UNIT_TARGETS) test-unit | ||
| test-unit: ## Run unit tests | ||
| $(GO) test -timeout $(TIMEOUT_UNIT) $(ARGS) ./... | ||
|
|
||
| TEST_E2E_TARGETS := test-e2e-short test-e2e-verbose test-e2e-race | ||
| test-e2e-short: ARGS=-short | ||
| test-e2e-verbose: ARGS=-v | ||
| test-e2e-race: ARGS=-race | ||
| $(TEST_E2E_TARGETS): test-e2e | ||
| .PHONY: $(TEST_E2E_TARGETS) test-e2e | ||
| test-e2e: ## Run end-to-end tests | ||
| $(GO) test -timeout $(TIMEOUT_E2E) -tags e2e $(ARGS) ./test/... | ||
|
|
||
| .PHONY: test-yamls | ||
| test-yamls: ## Run yaml tests | ||
| ./test/e2e-tests-yaml.sh --run-tests | ||
|
|
||
| .PHONY: check tests | ||
| check tests: test-unit test-e2e test-yamls | ||
|
|
||
| RAM = $(BIN)/ram | ||
| $(BIN)/ram: PACKAGE=go.sbr.pm/ram | ||
|
|
||
| .PHONY: watch-test | ||
| watch-test: | $(RAM) ; $(info $(M) watch and run tests) @ ## Watch and run tests | ||
| $Q $(RAM) -- -failfast | ||
|
|
||
| .PHONY: watch-resolve | ||
| watch-resolve: | $(KO) ; $(info $(M) watch and resolve config) @ ## Watch and build to the current cluster | ||
| $Q $(KO) resolve -W --push=false --oci-layout-path=$(BIN)/oci -f config 1>/dev/null | ||
|
|
||
| .PHONY: watch-config | ||
| watch-config: | $(KO) ; $(info $(M) watch and apply config) @ ## Watch and apply to the current cluster | ||
| $Q $(KO) apply -W -f config | ||
|
|
||
| ## Linters configuration and targets | ||
| # TODO(vdemeester) gofmt and goimports checks (run them with -w and make a diff) | ||
|
|
||
| GOLINT = $(BIN)/golint | ||
| $(BIN)/golint: PACKAGE=golang.org/x/lint/golint | ||
|
|
||
| .PHONY: golint | ||
| golint: | $(GOLINT) ; $(info $(M) running golint…) @ ## Run golint | ||
| $Q $(GOLINT) -set_exit_status $(PKGS) | ||
|
|
||
| .PHONY: vet | ||
| vet: | ; $(info $(M) running go vet…) @ ## Run go vet | ||
| $Q go vet ./... | ||
|
|
||
| INEFFASSIGN = $(BIN)/ineffassign | ||
| $(BIN)/ineffassign: PACKAGE=github.com/gordonklaus/ineffassign | ||
|
|
||
| .PHONY: ineffassign | ||
| ineffassign: | $(INEFFASSIGN) ; $(info $(M) running static ineffassign…) @ ## Run ineffassign | ||
| $Q $(INEFFASSIGN) . | ||
|
|
||
| STATICCHECK = $(BIN)/staticcheck | ||
| $(BIN)/staticcheck: PACKAGE=honnef.co/go/tools/cmd/staticcheck | ||
|
|
||
| .PHONY: staticcheck | ||
| staticcheck: | $(STATICCHECK) ; $(info $(M) running static check…) @ ## Run staticcheck | ||
| $Q $(STATICCHECK) ./... | ||
|
|
||
| DUPL = $(BIN)/dupl | ||
| $(BIN)/dupl: PACKAGE=github.com/mibk/dupl | ||
|
|
||
| .PHONY: dupl | ||
| dupl: | $(DUPL) ; $(info $(M) running dupl…) ## Run dupl | ||
| $Q $(DUPL) | ||
|
|
||
| ERRCHECK = $(BIN)/errcheck | ||
| $(BIN)/errcheck: PACKAGE=github.com/kisielk/errcheck | ||
|
|
||
| .PHONY: errcheck | ||
| errcheck: | $(ERRCHECK) ; $(info $(M) running errcheck…) ## Run errcheck | ||
| $Q $(ERRCHECK) ./... | ||
|
|
||
| GOLANGCILINT = $(BIN)/golangci-lint | ||
| $(BIN)/golangci-lint: ; $(info $(M) getting golangci-lint $(GOLANGCI_VERSION)) | ||
| cd tools; GOBIN=$(BIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_VERSION) | ||
|
|
||
| .PHONY: golangci-lint | ||
| golangci-lint: | $(GOLANGCILINT) ; $(info $(M) running golangci-lint…) @ ## Run golangci-lint | ||
| $Q $(GOLANGCILINT) run --modules-download-mode=vendor --max-issues-per-linter=0 --max-same-issues=0 --deadline 5m | ||
|
|
||
| GOIMPORTS = $(BIN)/goimports | ||
| $(BIN)/goimports: PACKAGE=golang.org/x/tools/cmd/goimports | ||
|
|
||
| .PHONY: goimports | ||
| goimports: | $(GOIMPORTS) ; $(info $(M) running goimports…) ## Run goimports | ||
| $Q $(GOIMPORTS) -l -e -w pkg cmd test | ||
|
|
||
| .PHONY: fmt | ||
| fmt: ; $(info $(M) running gofmt…) @ ## Run gofmt on all source files | ||
| $Q $(GO) fmt $(PKGS) | ||
|
|
||
| # Misc | ||
|
|
||
| .PHONY: clean | ||
| clean: ; $(info $(M) cleaning…) @ ## Cleanup everything | ||
| @rm -rf $(BIN) | ||
| @rm -rf bin | ||
| @rm -rf test/tests.* test/coverage.* | ||
|
|
||
| .PHONY: help | ||
| help: | ||
| @grep -hE '^[ a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \ | ||
| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-17s\033[0m %s\n", $$1, $$2}' | ||
|
|
||
| .PHONY: version | ||
| version: | ||
|
|
||
| @echo $(VERSION) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.