Skip to content

Commit e1961da

Browse files
committed
add building for linux and macos platforms
1 parent bd5a1fa commit e1961da

4 files changed

Lines changed: 21 additions & 8 deletions

File tree

Makefile

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
.PHONY: build dist test bench clean
22

3-
PLATFORMS = linux darwin
4-
ARCHITECTURES = amd64 arm64
3+
COMMIT := $(shell sh -c 'git log --pretty=format:"%h" -n 1 ')
4+
VERSION := $(shell sh -c 'git tag -l --sort=-version:refname "v*" | head -n1')
5+
LD_FLAGS := "-s -w -X 'main.Version=$(VERSION)' -X 'main.Commit=$(COMMIT)'"
6+
7+
PLATFORMS = linux darwin freebsd
8+
ARCHITECTURES = amd64 arm64 arm
59

610
build:
7-
go build -o bin/ ./cmd/...
11+
go build -ldflags $(LD_FLAGS) -o bin/ ./cmd/...
812

9-
dist:
13+
build-all: clean
1014
@for platform in $(PLATFORMS); do \
1115
for arch in $(ARCHITECTURES); do \
12-
GOOS=$$platform GOARCH=$$arch go build -o dist/thrust-$$platform-$$arch ./cmd/...; \
16+
if [ "$$platform" = "darwin" ] && [ "$$arch" = "arm" ]; then \
17+
continue; \
18+
fi; \
19+
output="dist/caddy-rails-$$platform-$$arch"; \
20+
21+
echo "Building for $$platform/$$arch..."; \
22+
env GOOS=$$platform GOARCH=$$arch go build -ldflags $(LD_FLAGS) -o $$output ./cmd/caddy_rails/main.go; \
1323
done \
1424
done
1525

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ This command creates a Caddyfile in the specified directory, tailoring it with o
7676
After the generation the `Caddyfile` you can run project by this command
7777

7878
```bash
79-
./caddy_rails run
79+
./caddy_rails run
8080
```
8181

8282
**Important:** The caddy_rails can not have enough permissions for ports 80 and 443.

cmd/caddy_rails/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func main() {
1616
flag.Parse()
1717

1818
if *versionFlag {
19-
fmt.Println(version.Version)
19+
fmt.Printf("Version: %s\nCommit: %s\n", version.Version, version.Commit)
2020
os.Exit(0)
2121
}
2222

version/version.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
package version
22

3-
const Version = "0.1.0"
3+
var (
4+
Version string
5+
Commit string
6+
)

0 commit comments

Comments
 (0)