File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change 5
5
SHELL := /bin/bash
6
6
PKG := github.com/operator-framework/operator-lifecycle-manager
7
7
MOD_FLAGS := $(shell (go version | grep -q -E "1\.(11|12) ") && echo -mod=vendor)
8
- CMDS := $(addprefix bin/, $(shell go list $(MOD_FLAGS ) ./cmd/... | xargs -I{} basename {}) )
8
+ CMDS := $(shell go list $(MOD_FLAGS ) ./cmd/...)
9
+ TCMDS := $(shell go list $(MOD_FLAGS ) ./test/e2e/...)
9
10
CODEGEN_INTERNAL := ./vendor/k8s.io/code-generator/generate_internal_groups.sh
10
11
MOCKGEN := ./scripts/generate_mocks.sh
11
12
# counterfeiter := $(GOBIN)/counterfeiter
@@ -42,6 +43,11 @@ coverage-html: cover.out
42
43
build : build_cmd=build
43
44
build : clean $(CMDS )
44
45
46
+ test-bare : BUILD_TAGS=-tags=bare
47
+ test-bare : clean $(TCMDS )
48
+
49
+ test-bin : clean $(TCMDS )
50
+
45
51
# build versions of the binaries with coverage enabled
46
52
build-coverage : build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/...
47
53
build-coverage : clean $(CMDS )
@@ -52,7 +58,10 @@ build-linux: clean $(CMDS)
52
58
53
59
$(CMDS ) : version_flags=-ldflags "-w -X $(PKG ) /pkg/version.GitCommit=`git rev-parse --short HEAD` -X $(PKG ) /pkg/version.OLMVersion=`cat OLM_VERSION`"
54
60
$(CMDS ) :
55
- CGO_ENABLED=0 $(arch_flags ) go $(build_cmd ) $(MOD_FLAGS ) $(version_flags ) -o $@ $(PKG ) /cmd/$(shell basename $@ ) ;
61
+ CGO_ENABLED=0 $(arch_flags ) go $(build_cmd ) $(MOD_FLAGS ) $(version_flags ) -o bin/$(shell basename $@ ) $@
62
+
63
+ $(TCMDS ) :
64
+ CGO_ENABLED=0 go test -c $(BUILD_TAGS ) $(MOD_FLAGS ) -o bin/$(shell basename $@ ) $@
56
65
57
66
run-local : build-linux
58
67
rm -rf build
You can’t perform that action at this time.
0 commit comments