2019-12-05 02:07:33 +00:00
|
|
|
From e2d12e52b3638a320a8d69ea4b392b60f44ea57f Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mario Rodas <marsam@users.noreply.github.com>
|
|
|
|
|
Date: Wed, 4 Dec 2019 21:07:33 -0500
|
|
|
|
|
Subject: [PATCH] Do not check Go module-mode availability
|
|
|
|
|
|
|
|
|
|
Since buildah vendorizes its dependencies we use buildGoPackage which
|
|
|
|
|
does not uses Go module-mode. The module-mode check will be true
|
|
|
|
|
because nixpkgs uses Go 1.13 by default, and building go modules with
|
|
|
|
|
buildGoPackage may lead to inconsistencies.
|
|
|
|
|
---
|
|
|
|
|
Makefile | 5 -----
|
|
|
|
|
1 file changed, 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
2020-01-31 21:19:33 +00:00
|
|
|
index 07724ce4..6383646e 100644
|
2019-12-05 02:07:33 +00:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2020-01-31 21:19:33 +00:00
|
|
|
@@ -15,14 +15,8 @@ BUILDAH := buildah
|
2019-12-05 02:07:33 +00:00
|
|
|
GO := go
|
|
|
|
|
GO110 := 1.10
|
|
|
|
|
GOVERSION := $(findstring $(GO110),$(shell go version))
|
|
|
|
|
-# test for go module support
|
|
|
|
|
-ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
|
|
|
|
|
-export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
|
2020-01-31 21:19:33 +00:00
|
|
|
-export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor
|
2019-12-05 02:07:33 +00:00
|
|
|
-else
|
|
|
|
|
export GO_BUILD=$(GO) build
|
2020-01-31 21:19:33 +00:00
|
|
|
export GO_TEST=$(GO) test
|
2019-12-05 02:07:33 +00:00
|
|
|
-endif
|
2020-01-31 21:19:33 +00:00
|
|
|
|
2019-12-05 02:07:33 +00:00
|
|
|
GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed"))
|
|
|
|
|
SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed"))
|
