Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generate go-licenses during tidy again #21108

Merged
merged 14 commits into from
Sep 9, 2022
Merged

Generate go-licenses during tidy again #21108

Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f72758b
Generate go-licenses during tidy again
silverwind Sep 7, 2022
cab1d0e
add silence
silverwind Sep 7, 2022
aef7322
remove tidy dependency from vendor
silverwind Sep 8, 2022
2bd40d0
make vendor a proper make target with dependencies
silverwind Sep 8, 2022
739b614
restor generate-frontend and add it to drone
silverwind Sep 8, 2022
b307bea
upgrade stray node version
silverwind Sep 8, 2022
70ff9c3
fix phony
silverwind Sep 8, 2022
8e73a7c
exclude root package in generate-go-licenses.go
silverwind Sep 8, 2022
258788b
grammar
silverwind Sep 8, 2022
dcbcf06
add it back to tidy
silverwind Sep 8, 2022
13b6ab8
remove it from tidy again
silverwind Sep 8, 2022
7d10ecd
remove unneeded step dependencies
silverwind Sep 8, 2022
fbc98a4
add missing dependencies
silverwind Sep 9, 2022
21bbfb6
Merge branch 'main' into nogodep
lunny Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,24 +405,25 @@ unit-test-coverage:
tidy:
$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
$(GO) mod tidy -compat=$(MIN_GO_VERSION)
@$(MAKE) --no-print-directory $(GO_LICENSE_FILE)

.PHONY: vendor
vendor: tidy
vendor: go.mod go.sum
6543 marked this conversation as resolved.
Show resolved Hide resolved
$(GO) mod vendor
@touch vendor

.PHONY: tidy-check
tidy-check: tidy
@diff=$$(git diff go.mod go.sum); \
@diff=$$(git diff go.mod go.sum $(GO_LICENSE_FILE)); \
if [ -n "$$diff" ]; then \
echo "Please run 'make tidy' and commit the result:"; \
echo "$${diff}"; \
exit 1; \
fi

.PHONY: go-licenses
go-licenses: assets/go-licenses.json
go-licenses: $(GO_LICENSE_FILE)

assets/go-licenses.json: go.mod go.sum
$(GO_LICENSE_FILE): go.mod go.sum
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
@rm -rf $(GO_LICENSE_TMP_DIR)
Expand Down Expand Up @@ -708,25 +709,22 @@ install: $(wildcard *.go)
build: frontend backend

.PHONY: frontend
frontend: generate-frontend $(WEBPACK_DEST)
frontend: $(WEBPACK_DEST)

.PHONY: backend
backend: go-check generate-backend $(EXECUTABLE)

# We generate the backend before the frontend in case we in future we want to generate things in the frontend from generated files in backend
.PHONY: generate
generate: generate-backend generate-frontend
generate: generate-backend

.PHONY: generate-backend
generate-backend: $(TAGS_PREREQ) generate-go

.PHONY: generate-go
generate-go: $(TAGS_PREREQ)
@echo "Running go generate..."
@CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES)

.PHONY: generate-frontend
generate-frontend: $(TAGS_PREREQ) go-licenses

$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

Expand Down