Skip to content

Commit 2b004d4

Browse files
committed
Add variables for URLs
To avoid the instruction to assume commands are in /bin
1 parent 9e5bc6b commit 2b004d4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $(XGO):
3030
.PHONY: golangci-lint
3131
golangci-lint: $(GOLANGCILINT)
3232
$(info running linter...)
33-
golangci-lint run --timeout=20m -v
33+
$(BIN_DIR)/golangci-lint run --timeout=20m -v
3434

3535
.PHONY: go-fmt
3636
go-fmt:
@@ -57,56 +57,56 @@ endif
5757
core-linux: $(XGO)
5858
$(info build core with linux as target...)
5959
mkdir -p $(ZBCPATH)
60-
xgo --targets=linux/amd64 -out=$(CORE_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./
60+
$(XGO) --targets=linux/amd64 -out=$(CORE_OUPUT) ./
6161

6262
.PHONY: core-arm
6363
core-arm: $(XGO)
6464
$(info build core with linux/arm-7 as target...)
6565
mkdir -p $(ZBCPATH)
66-
xgo --targets=linux/arm-7 -out=$(CORE_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./
66+
$(XGO) --targets=linux/arm-7 -out=$(CORE_OUPUT) ./
6767

6868
.PHONY: core-windows
6969
core-windows: $(XGO)
7070
$(info build core with windows as target...)
7171
mkdir -p $(ZBCPATH)
72-
xgo --targets=windows/* -out=$(CORE_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./
72+
$(XGO) --targets=windows/* -out=$(CORE_OUPUT) ./
7373

7474
.PHONY: core-darwin
7575
core-darwin: $(XGO)
7676
$(info build core with darwin/macos as target...)
7777
mkdir -p $(ZBCPATH)
78-
xgo --targets=darwin/* -out=$(CORE_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./
78+
$(XGO) --targets=darwin/* -out=$(CORE_OUPUT) ./
7979

8080
.PHONY: cmd-darwin
8181
cmd-darwin: $(XGO)
8282
$(info build cmd with darwin/macos as target...)
8383
mkdir -p $(ZBCPATH)
84-
xgo --targets=darwin/* -out=$(CLI_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./cmd/
84+
$(XGO) --targets=darwin/* -out=$(CLI_OUPUT) ./cmd/
8585

8686
.PHONY: cmd-linux
8787
cmd-linux: $(XGO)
8888
$(info build cmd with linux as target...)
8989
mkdir -p $(ZBCPATH)
90-
xgo --targets=linux/amd64 -out=$(CLI_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./cmd/
90+
$(XGO) --targets=linux/amd64 -out=$(CLI_OUPUT) ./cmd/
9191

9292
.PHONY: cmd-arm
9393
cmd-arm: $(XGO)
9494
$(info build cmd with linux/arm-7 as target...)
9595
mkdir -p $(ZBCPATH)
96-
xgo --targets=linux/arm-7 -out=$(CLI_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./cmd/
96+
$(XGO) --targets=linux/arm-7 -out=$(CLI_OUPUT) ./cmd/
9797

9898
.PHONY: cmd-windows
9999
cmd-windows: $(XGO)
100100
$(info build cmd with windows as target...)
101101
mkdir -p $(ZBCPATH)
102-
xgo --targets=windows/* -out=$(CLI_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./cmd/
102+
$(XGO) --targets=windows/* -out=$(CLI_OUPUT) ./cmd/
103103

104104

105105
.PHONY: core-common-os
106106
core-common-os: $(XGO)
107107
$(info build core with windows, linux & darwin as targets...)
108108
mkdir -p $(ZBCPATH)/linux $(ZBCPATH)/windows $(ZBCPATH)/darwin
109-
xgo --targets=windows/*,linux/amd64,darwin/amd64 -out=$(CORE_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./
109+
$(XGO) --targets=windows/*,linux/amd64,darwin/amd64 -out=$(CORE_OUPUT) ./
110110
mv $(CORE_OUPUT)-linux* $(ZBCPATH)/linux/$(BINARY_CORE_NAME)
111111
mv $(CORE_OUPUT)-windows*386.exe $(ZBCPATH)/windows/$(BINARY_CORE_NAME)-32bit.exe
112112
mv $(CORE_OUPUT)-windows*amd64.exe $(ZBCPATH)/windows/$(BINARY_CORE_NAME)-64bit.exe
@@ -116,7 +116,7 @@ core-common-os: $(XGO)
116116
cmd-common-os: $(XGO)
117117
$(info build cmd with windows, linux & darwin as targets...)
118118
mkdir -p $(ZBCPATH)/linux $(ZBCPATH)/windows $(ZBCPATH)/darwin
119-
xgo --targets=windows/*,linux/amd64,darwin/amd64 -out=$(CLI_OUPUT) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN) ./cmd/
119+
$(XGO) --targets=windows/*,linux/amd64,darwin/amd64 -out=$(CLI_OUPUT) ./cmd/
120120
mv $(CLI_OUPUT)-linux* $(ZBCPATH)/linux/$(BINARY_CLI_NAME)
121121
mv $(CLI_OUPUT)-windows*386.exe $(ZBCPATH)/windows/$(BINARY_CLI_NAME)-32bit.exe
122122
mv $(CLI_OUPUT)-windows*amd64.exe $(ZBCPATH)/windows/$(BINARY_CLI_NAME)-64bit.exe

0 commit comments

Comments
 (0)