Skip to content

Commit 7c99b61

Browse files
committed
fix: makefile build error, add test build on push
1 parent 497dedc commit 7c99b61

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

.github/workflows/go.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
go_version: [1.21, 1.22, 1.23, 1.24, 1.25]
22+
go_version: [1.21, 1.22, 1.23, 1.24, stable]
2323

2424
steps:
2525
- name: Check out code
@@ -63,3 +63,9 @@ jobs:
6363
run: |
6464
go test -cover ./...
6565
# go run ./cmd/chlog last head
66+
67+
- name: Build and run chlog
68+
if: ${{ matrix.go_version == 'stable' }}
69+
run: |
70+
go install ./cmd/chlog
71+
chlog --help

Makefile

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# TAG=$(tag)
1515

1616
BIN_NAME=chlog
17-
MAIN_SRC_FILE=cmd/chlog/main.go
17+
MAIN_SRC_FILE=main.go
1818
ROOT_PACKAGE := main
1919
VERSION=$(shell git for-each-ref refs/tags/ --count=1 --sort=-version:refname --format='%(refname:short)' 1 | sed 's/^v//')
2020

@@ -31,25 +31,29 @@ help:
3131
##Available Commands:
3232

3333
ins2bin: ## Install to GOPATH/bin
34-
go build $(BUILD_FLAGS) -o $(GOPATH)/bin/chlog $(MAIN_SRC_FILE)
34+
cd cmd/chlog && go build $(BUILD_FLAGS) -o $(GOPATH)/bin/chlog $(MAIN_SRC_FILE)
3535
chmod +x $(GOPATH)/bin/chlog
3636

3737
build-all:linux arm win darwin ## Build for Linux,ARM,OSX,Windows
3838

3939
linux: ## Build for Linux
40-
CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o build/$(BIN_NAME)-linux-amd64 $(MAIN_SRC_FILE)
41-
chmod +x build/$(BIN_NAME)-linux-amd64
40+
cd cmd/chlog && GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -o chlog-linux-amd64 $(MAIN_SRC_FILE)
41+
mv cmd/chlog/chlog-linux-amd64 build/chlog-linux-amd64
42+
chmod +x build/chlog-linux-amd64
4243

4344
arm: ## Build for ARM
44-
CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=arm go build $(BUILD_FLAGS) -o build/$(BIN_NAME)-linux-arm $(MAIN_SRC_FILE)
45-
chmod +x build/$(BIN_NAME)-linux-arm
46-
47-
win: ## Build for Windows
48-
CGO_ENABLED=$(CGO_ENABLED) GOOS=windows GOARCH=amd64 go build $(BUILD_FLAGS) -o build/$(BIN_NAME)-windows-amd64.exe $(MAIN_SRC_FILE)
45+
cd cmd/chlog && GOOS=linux GOARCH=arm go build $(BUILD_FLAGS) -o chlog-linux-arm $(MAIN_SRC_FILE)
46+
mv cmd/chlog/chlog-linux-arm build/chlog-linux-arm
47+
chmod +x build/chlog-linux-arm
4948

5049
darwin: ## Build for OSX
51-
CGO_ENABLED=$(CGO_ENABLED) GOOS=darwin GOARCH=amd64 go build $(BUILD_FLAGS) -o build/$(BIN_NAME)-darwin-amd64 $(MAIN_SRC_FILE)
52-
chmod +x build/$(BIN_NAME)-darwin-amd64
50+
cd cmd/chlog && GOOS=darwin GOARCH=amd64 go build $(BUILD_FLAGS) -o chlog-darwin-amd64 $(MAIN_SRC_FILE)
51+
mv cmd/chlog/chlog-darwin-amd64 build/chlog-darwin-amd64
52+
chmod +x build/chlog-darwin-amd64
53+
54+
win: ## Build for Windows
55+
cd cmd/chlog && GOOS=windows GOARCH=amd64 go build $(BUILD_FLAGS) -o chlog-windows-amd64.exe $(MAIN_SRC_FILE)
56+
mv cmd/chlog/chlog-windows-amd64.exe build/chlog-windows-amd64.exe
5357

5458
clean: ## Clean all created artifacts
5559
clean:

0 commit comments

Comments
 (0)