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

Add go licenses to licenses.txt #21034

Merged
merged 15 commits into from
Sep 3, 2022
Merged

Add go licenses to licenses.txt #21034

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0caad2f
Add go licenses to licenses.txt
silverwind Sep 2, 2022
4ea9fc5
remove coverage-bodged.out
silverwind Sep 2, 2022
98930e0
use same regex as google/go-licenses
silverwind Sep 2, 2022
6cb3a72
fix sorts
silverwind Sep 2, 2022
e86480e
misc tweaks
silverwind Sep 2, 2022
dd6c035
Update build/generate-go-licenses.js
silverwind Sep 2, 2022
dddd265
make target fully phony
silverwind Sep 3, 2022
a5c5073
change to json asset, sort all dependencies at once
silverwind Sep 3, 2022
6efe1cb
Merge branch 'main' into go-licenses
lunny Sep 3, 2022
0bd2a00
add make dependencies on tidy
silverwind Sep 3, 2022
b346392
add go-licenses to deps-backend
silverwind Sep 3, 2022
4a791ce
add DEBIAN_FRONTEND to all apt calls
silverwind Sep 3, 2022
eadda1b
swap flag order
silverwind Sep 3, 2022
f3a7d80
Merge branch 'main' into go-licenses
6543 Sep 3, 2022
4c5edca
update make help
silverwind Sep 3, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ cpu.out
!/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
/VERSION
/.air
/.go-licenses

# Snapcraft
snap/.snapcraft/
Expand Down
15 changes: 14 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected]
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
GO_LICENSES_PACKAGE ?= github.com/google/[email protected]

DOCKER_IMAGE ?= gitea/gitea
DOCKER_TAG ?= latest
Expand Down Expand Up @@ -114,13 +115,16 @@ SVG_DEST_DIR := public/img/svg

AIR_TMP_DIR := .air

GO_LICENSE_TMP_DIR := .go-licenses
GO_LICENSE_FILE := assets/go-licenses.txt

TAGS ?=
TAGS_SPLIT := $(subst $(COMMA), ,$(TAGS))
TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags

TEST_TAGS ?= sqlite sqlite_unlock_notify

TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR)
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)

GO_DIRS := cmd tests models modules routers build services tools

Expand Down Expand Up @@ -199,6 +203,7 @@ help:
@echo " - generate-swagger generate the swagger spec from code comments"
@echo " - swagger-validate check if the swagger spec is valid"
@echo " - golangci-lint run golangci-lint linter"
@echo " - go-licenses regenerate go-licenses.txt"
@echo " - vet examines Go source code and reports suspicious constructs"
@echo " - tidy run go mod tidy"
@echo " - test[\#TestSpecificName] run unit test"
Expand Down Expand Up @@ -407,6 +412,14 @@ tidy-check: tidy
exit 1; \
fi

.PHONY: go-licenses
go-licenses: assets/go-licenses.txt

assets/go-licenses.txt: go.mod go.sum build/generate-go-licenses.js
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path="$(GO_LICENSE_TMP_DIR)"
node build/generate-go-licenses.js "$(GO_LICENSE_TMP_DIR)" "$(GO_LICENSE_FILE)"
rm -rf "$(GO_LICENSE_TMP_DIR)"

generate-ini-sqlite:
sed -e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \
-e 's|{{TEST_LOGGER}}|$(or $(TEST_LOGGER),test$(COMMA)file)|g' \
Expand Down
Loading