Fix promu config (prometheus#1119)

Rename promu no-cgo config to default promu name to avoid crossbuild problems. Signed-off-by: Ben Kochie <superq@gmail.com>
ii · Oct 20, 2018 · 7519967 · 7519967
1 parent 0da9d24
commit 7519967
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
     steps:
     - checkout
     - run: make promu
-    - run: promu --config .promu-no-cgo.yml crossbuild -v --go 1.11
+    - run: promu crossbuild -v --go 1.11
     - run: promu --config .promu-cgo.yml crossbuild -v --go 1.11
     - persist_to_workspace:
         root: .

diff --git a/.promu-no-cgo.yml → .promu.yml b/.promu-no-cgo.yml → .promu.yml
diff --git a/Makefile b/Makefile
@@ -46,11 +46,11 @@ endif
 
 # Use CGO for non-Linux builds.
 ifeq ($(GOOS), linux)
-	PROMU_CONF ?= .promu-no-cgo.yml
+	PROMU_CONF ?= .promu.yml
 else
 	ifndef GOOS
 		ifeq ($(OS_detected), Linux)
-			PROMU_CONF ?= .promu-no-cgo.yml
+			PROMU_CONF ?= .promu.yml
 		else
 			PROMU_CONF ?= .promu-cgo.yml
 		endif