diff options
author | Ben Kochie <superq@gmail.com> | 2018-10-20 08:21:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-20 08:21:51 +0200 |
commit | 751996761903af4cffe18cf2d980b8ae9a202204 (patch) | |
tree | 4dd350cdc33c20da577f032fa0828725363c9d8c | |
parent | 0da9d248e785dfc5a1bef00277f0f30d36a4de28 (diff) | |
download | prometheus_node_collector-751996761903af4cffe18cf2d980b8ae9a202204.tar.bz2 prometheus_node_collector-751996761903af4cffe18cf2d980b8ae9a202204.tar.xz prometheus_node_collector-751996761903af4cffe18cf2d980b8ae9a202204.zip |
Fix promu config (#1119)v0.17.0-rc.0
Rename promu no-cgo config to default promu name to avoid crossbuild
problems.
Signed-off-by: Ben Kochie <superq@gmail.com>
-rw-r--r-- | .circleci/config.yml | 2 | ||||
-rw-r--r-- | .promu.yml (renamed from .promu-no-cgo.yml) | 0 | ||||
-rw-r--r-- | Makefile | 4 |
3 files changed, 3 insertions, 3 deletions
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: | |||
33 | steps: | 33 | steps: |
34 | - checkout | 34 | - checkout |
35 | - run: make promu | 35 | - run: make promu |
36 | - run: promu --config .promu-no-cgo.yml crossbuild -v --go 1.11 | 36 | - run: promu crossbuild -v --go 1.11 |
37 | - run: promu --config .promu-cgo.yml crossbuild -v --go 1.11 | 37 | - run: promu --config .promu-cgo.yml crossbuild -v --go 1.11 |
38 | - persist_to_workspace: | 38 | - persist_to_workspace: |
39 | root: . | 39 | root: . |
diff --git a/.promu-no-cgo.yml b/.promu.yml index b329ed3..b329ed3 100644 --- a/.promu-no-cgo.yml +++ b/.promu.yml | |||
@@ -46,11 +46,11 @@ endif | |||
46 | 46 | ||
47 | # Use CGO for non-Linux builds. | 47 | # Use CGO for non-Linux builds. |
48 | ifeq ($(GOOS), linux) | 48 | ifeq ($(GOOS), linux) |
49 | PROMU_CONF ?= .promu-no-cgo.yml | 49 | PROMU_CONF ?= .promu.yml |
50 | else | 50 | else |
51 | ifndef GOOS | 51 | ifndef GOOS |
52 | ifeq ($(OS_detected), Linux) | 52 | ifeq ($(OS_detected), Linux) |
53 | PROMU_CONF ?= .promu-no-cgo.yml | 53 | PROMU_CONF ?= .promu.yml |
54 | else | 54 | else |
55 | PROMU_CONF ?= .promu-cgo.yml | 55 | PROMU_CONF ?= .promu-cgo.yml |
56 | endif | 56 | endif |