diff options
| author | silverwind <me@silverwind.io> | 2022-10-10 20:45:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 20:45:02 +0200 |
| commit | 94037ada247e8b27c7b456e1eeb9461cdb433d66 (patch) | |
| tree | b8e64f4027f9b9826f10dbd0795acbff9288f8bf | |
| parent | 083ac164dc10aa871294c974415f6ba9c1e0a7f5 (diff) | |
| download | gitea-94037ada247e8b27c7b456e1eeb9461cdb433d66.tar.gz gitea-94037ada247e8b27c7b456e1eeb9461cdb433d66.zip | |
Hook go-licenses into tidy again (#21353)
Running it as part of the build is really unnecessary because we have a
valid output file in the repo and assuming go dependencies do not change
unless go.mod also changes, tidy really is the best target to run the
license generation after.
Also, regenerate the file as I missed to do so during the chroma update,
and mark all json files in assets as generated.
| -rw-r--r-- | .drone.yml | 16 | ||||
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | Makefile | 10 |
3 files changed, 8 insertions, 19 deletions
diff --git a/.drone.yml b/.drone.yml index 574976f6d6..1e21c43f39 100644 --- a/.drone.yml +++ b/.drone.yml @@ -100,7 +100,7 @@ steps: - name: checks-backend image: golang:1.19 commands: - - make checks-backend + - make --always-make checks-backend # ensure the 'go-licenses' make target runs depends_on: [deps-backend] volumes: - name: deps @@ -112,16 +112,11 @@ steps: - make test-frontend depends_on: [lint-frontend] - - name: generate-frontend - image: golang:1.19 - commands: - - make generate-frontend - - name: build-frontend image: node:18 commands: - make frontend - depends_on: [deps-frontend, generate-frontend] + depends_on: [deps-frontend] - name: build-backend-no-gcc image: golang:1.18 # this step is kept as the lowest version of golang that we support @@ -549,16 +544,11 @@ steps: commands: - make deps-frontend - - name: generate-frontend - image: golang:1.18 - commands: - - make generate-frontend - - name: build-frontend image: node:18 commands: - make frontend - depends_on: [deps-frontend, generate-frontend] + depends_on: [deps-frontend] - name: deps-backend image: golang:1.18 diff --git a/.gitattributes b/.gitattributes index bb2783b0ad..34482b9e8c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ * text=auto eol=lf *.tmpl linguist-language=Handlebars +/assets/*.json linguist-generated /public/vendor/** -text -eol linguist-vendored /vendor/** -text -eol linguist-vendored /web_src/fomantic/build/** linguist-generated @@ -406,6 +406,7 @@ 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) vendor: go.mod go.sum $(GO) mod vendor @@ -413,7 +414,7 @@ vendor: go.mod go.sum .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}"; \ @@ -709,17 +710,14 @@ 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 - -.PHONY: generate-frontend -generate-frontend: $(GO_LICENSE_FILE) +generate: generate-backend .PHONY: generate-backend generate-backend: $(TAGS_PREREQ) generate-go |