github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3616 from rn/gomod

Browse Source 
Fix go-compile for go.mod
This commit is contained in:
Rolf Neugebauer 2021-04-03 11:16:58 +01:00 committed by GitHub
commit e02ccb6008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
VERSION="v0.8+" VERSION="v0.8+"
GIT_COMMIT=$(shell git rev-list -1 HEAD) GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=linuxkit/go-compile:b1446b2ba407225011f97ae1dba0f512ae7f9b84 GO_COMPILE=linuxkit/go-compile:6d73c4723ae2b58af22e3736b2b0f0292e18eb6d
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LINUXKIT?=bin/linuxkit.exe LINUXKIT?=bin/linuxkit.exe

2
docs/vendoring.md
View File

@ -30,6 +30,6 @@ docker run -it --rm \
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
--entrypoint=go --entrypoint=go
linuxkit/go-compile:b1446b2ba407225011f97ae1dba0f512ae7f9b84 linuxkit/go-compile:6d73c4723ae2b58af22e3736b2b0f0292e18eb6d
mod vendor mod vendor
``` ```

11
tools/go-compile/compile.sh
View File

@ -73,12 +73,15 @@ fi
cd "$dir" cd "$dir"
# Use '-mod=vendor' for builds which have switched to go modules
[ -f go.mod ] && MOD_ARG="-mod=vendor"
# lint before building # lint before building
>&2 echo "gofmt..." >&2 echo "gofmt..."
test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr) test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)
>&2 echo "govet..." >&2 echo "govet..."
test -z $(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr) test -z $(GOOS=linux go vet $MOD_ARG -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr)
>&2 echo "golint..." >&2 echo "golint..."
test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr) test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr)
@ -92,12 +95,12 @@ if [ "$GOOS" = "darwin" -o "$GOOS" = "windows" ]
then then
if [ -z "$ldflags" ] if [ -z "$ldflags" ]
then then
go build -o $out "$package" go build $MOD_ARG -o $out "$package"
else else
go build -o $out -ldflags "${ldflags}" "$package" go build $MOD_ARG -o $out -ldflags "${ldflags}" "$package"
fi fi
else else
go build -o $out -buildmode pie -ldflags "-s -w ${ldflags} -extldflags \"-static\"" "$package" go build $MOD_ARG -o $out -buildmode pie -ldflags "-s -w ${ldflags} -extldflags \"-static\"" "$package"
fi fi
tar cf - $out tar cf - $out