8000 fix(cdsctl): linux amd64 nokeychain support (#4380) · ovh/cds@974762d · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 974762d

Browse files
yesnaultyesnault
authored
fix(cdsctl): linux amd64 nokeychain support (#4380)
* fix(cdsctl): linux amd64 nokeychain support Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
1 parent 932fcd3 commit 974762d

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

‎cli/cdsctl/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ clean:
6363

6464
$(TARGET_BINARIES):
6565
$(info *** building binary $@)
66-
@$(MAKE) --no-print-directory gobuild GOOS=$(call get_os_from_binary_file,$@) GOARCH=$(call get_arch_from_binary_file,$@) OUTPUT=$@
66+
@$(MAKE) --no-print-directory gobuild TAGS='' GOOS=$(call get_os_from_binary_file,$@) GOARCH=$(call get_arch_from_binary_file,$@) OUTPUT=$@
6767

6868
$(TARGET_BINARIES_VARIANT):
69-
$(info *** building binary $@)
70-
@$(MAKE) --no-print-directory gobuild GOOS=$(call get_os_from_binary_file,$(subst -nokeychain,,$@)) GOARCH=$(call get_arch_from_binary_file,$(subst -nokeychain,,$@)) OUTPUT=$@
69+
$(info *** building binary variant $@)
70+
@$(MAKE) --no-print-directory gobuild TAGS="--tags='nokeychain'" GOOS=$(call get_os_from_binary_file,$(subst -nokeychain,,$@)) GOARCH=$(call get_arch_from_binary_file,$(subst -nokeychain,,$@)) OUTPUT=$@
7171

7272
gobuild:
7373
$(info ... OS:$(GOOS) ARCH:$(GOARCH) -> $(OUTPUT))
74-
@GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO_BUILD) $(TARGET_LDFLAGS) -o $(OUTPUT)
74+
@GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO_BUILD) $(TAGS) $(TARGET_LDFLAGS) -o $(OUTPUT)
7575

7676
build: $(TARGET_DIR) $(TARGET_BINARIES_VARIANT) $(TARGET_BINARIES)
7777

‎cli/cdsctl/configstore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build freebsd openbsd linux,386 linux,arm windows,386 windows,arm nokeychain
1+
// +build nokeychain freebsd openbsd 386
22

33
package main
44

‎cli/cdsctl/configstore_linux_amd64.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// +build !nokeychain
2+
13
package main
24

35
import (

‎engine/api/pipeline_parameter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (api *API) updateParameterInPipelineHandler() service.Handler {
8383
return err
8484
}
8585

86-
p, err := pipeline.LoadPipeline(api.mustDB(), key, pipelineName, false)
86+
p, err := pipeline.LoadPipeline(api.mustDB(), key, pipelineName, true)
8787
if err != nil {
8888
return sdk.WrapError(err, "updateParameterInPipelineHandler: Cannot load %s", pipelineName)
8989
}

0 commit comments

Comments
 (0)
0