From 751996761903af4cffe18cf2d980b8ae9a202204 Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Sat, 20 Oct 2018 08:21:51 +0200
Subject: Fix promu config (#1119)

Rename promu no-cgo config to default promu name to avoid crossbuild
problems.

Signed-off-by: Ben Kochie <superq@gmail.com>
---
 .circleci/config.yml |  2 +-
 .promu-no-cgo.yml    | 29 -----------------------------
 .promu.yml           | 29 +++++++++++++++++++++++++++++
 Makefile             |  4 ++--
 4 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 .promu-no-cgo.yml
 create mode 100644 .promu.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e5688ea..abda9db 100644
--- 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 b/.promu-no-cgo.yml
deleted file mode 100644
index b329ed3..0000000
--- a/.promu-no-cgo.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-repository:
-    path: github.com/prometheus/node_exporter
-build:
-    binaries:
-        - name: node_exporter
-    flags: -a -tags 'netgo static_build'
-    ldflags: |
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
-tarball:
-    files:
-        - LICENSE
-        - NOTICE
-crossbuild:
-    platforms:
-        - linux/amd64
-        - linux/386
-        - linux/arm
-        - linux/arm64
-        - linux/mips
-        - linux/mipsle
-        - linux/mips64
-        - linux/mips64le
-        - linux/ppc64
-        - linux/ppc64le
-        - linux/s390x
diff --git a/.promu.yml b/.promu.yml
new file mode 100644
index 0000000..b329ed3
--- /dev/null
+++ b/.promu.yml
@@ -0,0 +1,29 @@
+repository:
+    path: github.com/prometheus/node_exporter
+build:
+    binaries:
+        - name: node_exporter
+    flags: -a -tags 'netgo static_build'
+    ldflags: |
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+tarball:
+    files:
+        - LICENSE
+        - NOTICE
+crossbuild:
+    platforms:
+        - linux/amd64
+        - linux/386
+        - linux/arm
+        - linux/arm64
+        - linux/mips
+        - linux/mipsle
+        - linux/mips64
+        - linux/mips64le
+        - linux/ppc64
+        - linux/ppc64le
+        - linux/s390x
diff --git a/Makefile b/Makefile
index 835a407..dae2c8e 100644
--- 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
-- 
cgit v1.2.3