Removes bingo for go run
#350
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 |
|---|---|---|
|
|
@@ -15,23 +15,26 @@ | |
| # Make sure we pick up any local overrides. | ||
| -include .makerc | ||
|
|
||
| goimports := golang.org/x/tools/cmd/[email protected] | ||
| golangci_lint := github.com/golangci/golangci-lint/cmd/[email protected] | ||
| goreleaser := github.com/goreleaser/[email protected] | ||
| hugo := github.com/gohugoio/[email protected] | ||
| licenser := github.com/liamawhite/[email protected] | ||
|
|
||
| ##@ Binary distribution | ||
|
|
||
| .PHONY: release | ||
| release: | ||
| @echo "--- release ---" | ||
| @go run $(goreleaser) release --rm-dist | ||
|
|
||
| GOOS := $(shell go env GOOS) | ||
| GOARCH := $(shell go env GOARCH) | ||
| BIN := dist/func-e_$(GOOS)_$(GOARCH) | ||
| bin $(BIN): | ||
| @echo "--- bin ---" | ||
| # skip post hooks on bin so that e2e tests don't need to have osslsigncode installed | ||
| @go run $(goreleaser) build --snapshot --single-target --skip-post-hooks --rm-dist | ||
|
|
||
| # Requires `wixl` from msitools https://wiki.gnome.org/msitools (or `brew install msitools`) | ||
| # If Windows, you can download from here https://github.com/wixtoolset/wix3/releases | ||
|
|
@@ -43,9 +46,9 @@ MSI_VERSION ?= 0.0.1 | |
| # Right now, the only arch we support is amd64 because Envoy doesn't yet support arm64 on Windows | ||
| # https://github.com/envoyproxy/envoy/issues/17572 | ||
| # Once that occurs, we will need to set -arch arm64 and bundle accordingly. | ||
| $(WIN_BIN_EXE): | ||
| @echo "--- win-bin ---" | ||
| @GOOS=windows GOARCH=amd64 @go run $(goreleaser) build --snapshot --single-target --rm-dist | ||
|
|
||
| # Default is self-signed while production should be a Digicert signing key | ||
| # | ||
|
|
@@ -91,10 +94,10 @@ endif | |
|
|
||
| ##@ Test website | ||
| .PHONY: site | ||
| site: | ||
| @echo "--- site ---" | ||
| @git submodule update | ||
| @cd site && go run $(hugo) server --disableFastRender -D | ||
|
|
||
| ##@ Unit and End-to-End tests | ||
|
|
||
|
|
@@ -123,23 +126,23 @@ coverage: | |
| @go tool cover -func coverage.txt | ||
|
|
||
| .PHONY: lint | ||
| lint: .golangci.yml .goreleaser.yaml ## Run the linters | ||
| @echo "--- lint ---" | ||
| @go run $(licenser) verify -r . | ||
| @go run $(golangci_lint) run --timeout 5m --config .golangci.yml ./... | ||
| @go run $(goreleaser) check -q | ||
|
|
||
| # The goimports tool does not arrange imports in 3 blocks if there are already more than three blocks. | ||
| # To avoid that, before running it, we collapse all imports in one block, then run the formatter. | ||
| .PHONY: format | ||
| format: ## Format all Go code | ||
| @echo "--- format ---" | ||
| @go run $(licenser) apply -r "Tetrate" | ||
| @find . -type f -name '*.go' | xargs gofmt -s -w | ||
| @for f in `find . -name '*.go'`; do \ | ||
| awk '/^import \($$/,/^\)$$/{if($$0=="")next}{print}' $$f > /tmp/fmt; \ | ||
| mv /tmp/fmt $$f; \ | ||
|
There was a problem hiding this comment. doing this in a loop is as time consuming as trying to parse wtf ^^ was trying to do |
||
| go run $(goimports) -w -local github.com/tetratelabs/func-e $$f; \ | ||
| done | ||
|
|
||
| # Enforce go version matches what's in go.mod when running `make check` assuming the following: | ||
|
|
@@ -167,8 +170,8 @@ check: ## CI blocks merge until this passes. If this fails, run "make check" lo | |
| fi | ||
|
|
||
| .PHONY: clean | ||
| clean: ## Clean all binaries | ||
| @echo "--- $@ ---" | ||
| @rm -rf dist coverage.txt | ||
| @go clean -testcache | ||
| @go run $(golangci_lint) cache clean | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will sort out the build cache in a different PR as it requires handling Os-specifics!