Skip to content

Commit

Permalink
Replace golicense with go-licenses (#1454)
Browse files Browse the repository at this point in the history
* use go-licenses instead of golicense

* remove lint-licenses from semaphore

* revert legal directory

* generate packaging patch

* fix goreleaser file

* use f instead of file
  • Loading branch information
brianstrauch authored Oct 7, 2022
1 parent cac9b43 commit cab2c0b
Show file tree
Hide file tree
Showing 14 changed files with 65 additions and 468 deletions.
5 changes: 0 additions & 5 deletions .golicense-downloader.json

This file was deleted.

20 changes: 0 additions & 20 deletions .golicense.hcl

This file was deleted.

1 change: 0 additions & 1 deletion .goreleaser-linux-glibc-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,4 @@ archives:
format: zip
wrap_in_directory: "{{ .ProjectName }}"
files:
- LICENSE
- legal/**/*
1 change: 0 additions & 1 deletion .goreleaser-linux-glibc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,4 @@ archives:
format: zip
wrap_in_directory: "{{ .ProjectName }}"
files:
- LICENSE
- legal/**/*
4 changes: 0 additions & 4 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ builds:
hooks:
post:
- cmd: make download-licenses
env:
- LICENSE_BIN=confluent
- LICENSE_BIN_PATH=./dist/signed-amd64_darwin_amd64/confluent
- cmd: gon gon_confluent_amd64.hcl
- binary: confluent
id: signed-arm64
Expand Down Expand Up @@ -137,7 +134,6 @@ archives:
format: zip
wrap_in_directory: "{{ .ProjectName }}"
files:
- LICENSE
- legal/**/*

blobs:
Expand Down
1 change: 0 additions & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ blocks:
- make lint
- ulimit -n 2048
- make test
# - make lint-licenses

# Cache Go dependencies
- cache store linux-$(checksum go.sum) $(go env GOPATH)/pkg/mod
Expand Down
13 changes: 5 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@ generate:

.PHONY: deps
deps:
go install github.com/goreleaser/[email protected] && \
go install github.com/golangci/golangci-lint/cmd/[email protected] && \
go install github.com/google/[email protected] && \
go install github.com/goreleaser/[email protected] && \
go install gotest.tools/[email protected]

.PHONY: jenkins-deps
# Jenkins only depends on goreleaser, so we omit golangci-lint and golicense
# Jenkins only depends on goreleaser
jenkins-deps:
go get github.com/goreleaser/[email protected]

Expand Down Expand Up @@ -162,12 +163,8 @@ cmd/lint/en_US.dic:
curl -s "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries/+/master/en_US.dic?format=TEXT" | base64 -D > $@

.PHONY: lint-licenses
## Scan and validate third-party dependency licenses
lint-licenses: build
$(eval token := $(shell (grep github.com ~/.netrc -A 2 | grep password || grep github.com ~/.netrc -A 2 | grep login) | head -1 | awk -F' ' '{ print $$2 }'))
echo Licenses for confluent binary ; \
[ -t 0 ] && args="" || args="-plain" ; \
GITHUB_TOKEN=$(token) golicense $${args} .golicense.hcl ./dist/confluent_$(shell go env GOOS)_$(shell go env GOARCH)/confluent || true
lint-licenses:
go-licenses report ./...

.PHONY: test-prep
test-prep:
Expand Down
270 changes: 0 additions & 270 deletions cmd/golicense-downloader/main.go

This file was deleted.

Loading

0 comments on commit cab2c0b

Please sign in to comment.