RepoMirrors
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ben Kochie 2018-10-20 08:21:51 +02:00 committed by GitHub
parent 0da9d248e7
commit 7519967619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -33,7 +33,7 @@ jobs:
steps: steps:
- checkout - checkout
- run: make promu - 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 - run: promu --config .promu-cgo.yml crossbuild -v --go 1.11
- persist_to_workspace: - persist_to_workspace:
root: . root: .

0
.promu-no-cgo.yml → .promu.yml
View File

4
Makefile
View File

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