Skip to content

Commit

Permalink
vendor deps for network isolated builds (#308)
Browse files Browse the repository at this point in the history
* vendor deps for network isolated builds

* clean build

* improve ci

* speed up build
  • Loading branch information
labkode committed Oct 17, 2019
1 parent ffa0628 commit 02e4953
Show file tree
Hide file tree
Showing 1,601 changed files with 561,317 additions and 28 deletions.
4 changes: 1 addition & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ platform:

steps:
- name: build
pull: always
image: golang:1.13
commands:
- make deps
- make
- make ci
51 changes: 28 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,46 @@ BUILD_PLATFORM=`go version | awk '{print $$4}'`

LDFLAGS=-ldflags "-s -X main.buildDate=${BUILD_DATE} -X main.gitCommit=${GIT_DIRTY}${GIT_COMMIT} -X main.gitBranch=${GIT_BRANCH} -X main.version=${VERSION} -X main.goVersion=${GO_VERSION} -X main.buildPlatform=${BUILD_PLATFORM}"

build:
go build ./...
go build -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad
go build -o ./cmd/reva/reva ${LDFLAGS} ./cmd/reva
off:
GORPOXY=off

imports: off
goimports -w tools pkg internal cmd

build: imports
go build -mod=vendor -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad
go build -mod=vendor -o ./cmd/reva/reva ${LDFLAGS} ./cmd/reva

tidy:
go mod tidy

build-revad:
go build ./...
go build -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad
build-revad: imports
go build -mod=venodr -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad

build-reva:
go build ./...
go build -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad
build-reva: imports
go build -mod=vendor -o ./cmd/reva/reva ${LDFLAGS} ./cmd/reva

test:
go test -race ./...
test: off
go test -mod=vendor -race ./...

lint:
go run tools/check-license/check-license.go
goimports -w .
golangci-lint run

contrib:
git log --pretty="%an <%ae>" | sort -n | uniq | sort -n | awk '{print "-", $$0}' | grep -v 'users.noreply.github.com' > CONTRIBUTORS.md

license:
go run github.com/mitchellh/golicense license.hcl cmd/revad/revad
go run github.com/mitchellh/golicense license.hcl cmd/revad/reva

deploy:
go build -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad
./cmd/revad/revad -c ./cmd/revad/revad.toml -p ./cmd/revad/revad.pid
deps:
cd /tmp && go get -u golang.org/x/lint/golint
# for manual building only
deps:
cd /tmp && go get github.com/golangci/golangci-lint/cmd/golangci-lint
cd /tmp && go get -u golang.org/x/tools/cmd/goimports
cd /tmp && go get golang.org/x/tools/cmd/goimports

build-ci: off
go build -mod=vendor -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad
go build -mod=vendor -o ./cmd/reva/reva ${LDFLAGS} ./cmd/reva
lint-ci:
go run tools/check-license/check-license.go


# to be run in CI platform
ci: build-ci test lint-ci
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ require (
github.com/fatih/color v1.7.0 // indirect
github.com/go-openapi/strfmt v0.19.2 // indirect
github.com/gofrs/uuid v3.2.0+incompatible
github.com/gogo/protobuf v1.2.0 // indirect
github.com/golang/protobuf v1.3.2
github.com/gomodule/redigo v2.0.0+incompatible
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
Expand Down
14 changes: 12 additions & 2 deletions tools/check-license/check-license.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"io/ioutil"
"os"
"path/filepath"
"strings"
)

var fix = flag.Bool("fix", false, "add header if not present")
Expand All @@ -51,12 +52,21 @@ var licenseText = `// Copyright 2018-2019 CERN

const prefix = "// Copyright "

var skip = map[string]bool{}
var toSkip = []string{"vendor/"}

func skip(path string) bool {
for _, v := range toSkip {
if strings.HasPrefix(path, v) {
return true
}
}
return false
}

func main() {
flag.Parse()
err := filepath.Walk(".", func(path string, fi os.FileInfo, err error) error {
if skip[path] {
if skip(path) {
return nil
}

Expand Down
17 changes: 17 additions & 0 deletions vendor/contrib.go.opencensus.io/exporter/jaeger/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

201 changes: 201 additions & 0 deletions vendor/contrib.go.opencensus.io/exporter/jaeger/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 02e4953

Please sign in to comment.