You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.0 KiB
37 lines
1.0 KiB
7 years ago
|
Index: src/k8s.io/helm/Makefile
|
||
|
|
--- src/k8s.io/helm/Makefile.orig 2019-03-24 09:51:45.000000000 +0100
|
||
|
|
+++ src/k8s.io/helm/Makefile 2019-03-24 10:05:21.313313000 +0100
|
||
|
|
@@ -9,12 +9,12 @@
|
||
|
|
|
||
|
|
# go option
|
||
|
|
GO ?= go
|
||
|
|
-PKG := $(shell glide novendor)
|
||
|
|
+PKG :=
|
||
|
|
TAGS :=
|
||
|
|
TESTS := .
|
||
|
|
TESTFLAGS :=
|
||
|
|
-LDFLAGS := -w -s
|
||
|
|
-GOFLAGS :=
|
||
|
|
+LDFLAGS :=
|
||
|
|
+GOFLAGS := -v
|
||
|
|
BINDIR := $(CURDIR)/bin
|
||
|
|
BINARIES := helm tiller
|
||
|
|
|
||
|
|
Index: src/k8s.io/helm/versioning.mk
|
||
|
|
--- src/k8s.io/helm/versioning.mk.orig 2019-03-24 09:51:45.000000000 +0100
|
||
|
|
+++ src/k8s.io/helm/versioning.mk 2019-03-24 10:06:16.396532000 +0100
|
||
|
|
@@ -1,9 +1,9 @@
|
||
|
|
MUTABLE_VERSION := canary
|
||
|
|
|
||
|
|
-GIT_COMMIT = $(shell git rev-parse HEAD)
|
||
|
|
-GIT_SHA = $(shell git rev-parse --short HEAD)
|
||
|
|
-GIT_TAG = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
|
||
|
|
-GIT_DIRTY = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean")
|
||
|
|
+GIT_COMMIT = 000000
|
||
|
|
+GIT_SHA = 000000
|
||
|
|
+GIT_TAG = master
|
||
|
|
+GIT_DIRTY = clean
|
||
|
|
|
||
|
|
ifdef VERSION
|
||
|
|
DOCKER_VERSION = $(VERSION)
|