From 0df9908907c83124b886d17624444ef1b59c6b04 Mon Sep 17 00:00:00 2001 From: William Petit Date: Tue, 13 Oct 2020 10:59:41 +0200 Subject: [PATCH] Do not use vendoring --- Makefile | 8 ++------ misc/script/release.sh | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 975309c..88608ff 100644 --- a/Makefile +++ b/Makefile @@ -2,17 +2,14 @@ DOKKU_HOST := dokku@dev.lookingfora.name SHELL := /bin/bash build: - CGO_ENABLED=0 go build -mod=vendor -v -o ./bin/server ./cmd/server + CGO_ENABLED=0 go build -v -o ./bin/server ./cmd/server test: go test -v -race ./... -release: vendor +release: @$(SHELL) ./misc/script/release.sh -vendor: - go mod vendor - tidy: go mod tidy @@ -25,7 +22,6 @@ lint: clean: rm -rf release rm -rf data - rm -rf vendor rm -rf bin dokku-build: diff --git a/misc/script/release.sh b/misc/script/release.sh index 0343620..970d2bf 100644 --- a/misc/script/release.sh +++ b/misc/script/release.sh @@ -24,7 +24,6 @@ function build { echo "building $dirname..." CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" go build \ - -mod=vendor \ -ldflags="-s -w -X 'main.GitRef=$(current_commit_ref)' -X 'main.ProjectVersion=$(current_version)' -X 'main.BuildDate=$(current_date)'" \ -gcflags=-trimpath="${PWD}" \ -asmflags=-trimpath="${PWD}" \