add version flag and Gitea release targets
This commit is contained in:
@@ -1,12 +1,18 @@
|
|||||||
BINARY := ./bin/photoscli
|
BINARY := ./bin/photoscli
|
||||||
MODULE := gitea.k3s.k0.nu/tools/photocli
|
MODULE := gitea.k3s.k0.nu/tools/photocli
|
||||||
|
VERSION := 0.1.0
|
||||||
BRIDGE_DIR := bridge
|
BRIDGE_DIR := bridge
|
||||||
|
LDFLAGS := -X main.version=$(VERSION)
|
||||||
OBJ := $(BRIDGE_DIR)/photokit_bridge.o
|
OBJ := $(BRIDGE_DIR)/photokit_bridge.o
|
||||||
LIB := $(BRIDGE_DIR)/libphotokit_bridge.a
|
LIB := $(BRIDGE_DIR)/libphotokit_bridge.a
|
||||||
STUB_OBJ := $(BRIDGE_DIR)/photokit_bridge_stub.o
|
STUB_OBJ := $(BRIDGE_DIR)/photokit_bridge_stub.o
|
||||||
STUB_LIB := $(BRIDGE_DIR)/libphotokit_bridge_stub.a
|
STUB_LIB := $(BRIDGE_DIR)/libphotokit_bridge_stub.a
|
||||||
|
GITEA_HOST := gitea-1.tail82444.ts.net
|
||||||
|
GITEA_REPO := tools/photocli
|
||||||
|
|
||||||
.PHONY: build clean test coverage
|
.PHONY: all build clean test coverage tag release
|
||||||
|
|
||||||
|
all: build
|
||||||
|
|
||||||
$(LIB): $(OBJ)
|
$(LIB): $(OBJ)
|
||||||
ar rcs $@ $<
|
ar rcs $@ $<
|
||||||
@@ -21,7 +27,7 @@ $(STUB_OBJ): $(BRIDGE_DIR)/photokit_bridge_stub.c $(BRIDGE_DIR)/photokit_bridge.
|
|||||||
cc -c -o $@ $<
|
cc -c -o $@ $<
|
||||||
|
|
||||||
build: $(LIB)
|
build: $(LIB)
|
||||||
go build -o $(BINARY) $(MODULE)/cmd/photoscli
|
go build -ldflags "$(LDFLAGS)" -o $(BINARY) $(MODULE)/cmd/photoscli
|
||||||
|
|
||||||
test: $(STUB_LIB)
|
test: $(STUB_LIB)
|
||||||
go test -tags=test -coverprofile=coverage.out -covermode=atomic -coverpkg=./... ./...
|
go test -tags=test -coverprofile=coverage.out -covermode=atomic -coverpkg=./... ./...
|
||||||
@@ -37,3 +43,22 @@ coverage: $(STUB_LIB)
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(BINARY) $(OBJ) $(LIB) $(STUB_OBJ) $(STUB_LIB) coverage.out
|
rm -f $(BINARY) $(OBJ) $(LIB) $(STUB_OBJ) $(STUB_LIB) coverage.out
|
||||||
|
|
||||||
|
tag:
|
||||||
|
git tag v$(VERSION)
|
||||||
|
git push origin v$(VERSION)
|
||||||
|
|
||||||
|
release: build tag
|
||||||
|
ifndef GITEA_TOKEN
|
||||||
|
$(error GITEA_TOKEN is required. Set it with: export GITEA_TOKEN=your-token)
|
||||||
|
endif
|
||||||
|
curl -sf -X POST "https://$(GITEA_HOST)/api/v1/repos/$(GITEA_REPO)/releases" \
|
||||||
|
-H "Authorization: token $(GITEA_TOKEN)" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"tag_name":"v$(VERSION)","name":"v$(VERSION)","body":"photoscli v$(VERSION)"}' | python3 -c "import sys,json; d=json.load(sys.stdin); print(d['id'])" > /tmp/_photoscli_release_id
|
||||||
|
@echo "created release v$(VERSION)"
|
||||||
|
curl -sf -X POST "https://$(GITEA_HOST)/api/v1/repos/$(GITEA_REPO)/releases/$$(cat /tmp/_photoscli_release_id)/assets?name=photoscli" \
|
||||||
|
-H "Authorization: token $(GITEA_TOKEN)" \
|
||||||
|
-F "attachment=@$(BINARY)"
|
||||||
|
@echo "uploaded $(BINARY) to release v$(VERSION)"
|
||||||
|
@rm -f /tmp/_photoscli_release_id
|
||||||
@@ -26,6 +26,9 @@ func run(args []string, stdout, stderr io.Writer, bridge photos.Bridge) int {
|
|||||||
return cmdBackupAll(args[1:], stdout, stderr, bridge)
|
return cmdBackupAll(args[1:], stdout, stderr, bridge)
|
||||||
case "export":
|
case "export":
|
||||||
return cmdExport(args[1:], stdout, stderr, bridge)
|
return cmdExport(args[1:], stdout, stderr, bridge)
|
||||||
|
case "version", "--version", "-v":
|
||||||
|
fmt.Fprintln(stdout, version)
|
||||||
|
return 0
|
||||||
case "help", "--help", "-h":
|
case "help", "--help", "-h":
|
||||||
usage(stderr)
|
usage(stderr)
|
||||||
return 0
|
return 0
|
||||||
@@ -45,6 +48,7 @@ Usage:
|
|||||||
photoscli tree
|
photoscli tree
|
||||||
photoscli backup-all --out <dir> [--size <px>] [--originals]
|
photoscli backup-all --out <dir> [--size <px>] [--originals]
|
||||||
photoscli export --album-id <id> --out <dir> [--size <px>] [--originals]
|
photoscli export --album-id <id> --out <dir> [--size <px>] [--originals]
|
||||||
|
photoscli version
|
||||||
|
|
||||||
Commands:
|
Commands:
|
||||||
albums List user-created albums
|
albums List user-created albums
|
||||||
@@ -52,6 +56,7 @@ Commands:
|
|||||||
tree Show folder and album hierarchy
|
tree Show folder and album hierarchy
|
||||||
backup-all Export all albums into the Photos folder tree
|
backup-all Export all albums into the Photos folder tree
|
||||||
export Export optimized JPEG previews or original files
|
export Export optimized JPEG previews or original files
|
||||||
|
version Print version
|
||||||
|
|
||||||
Flags:
|
Flags:
|
||||||
--album-id <id> Album local identifier or title (required for photos/export)
|
--album-id <id> Album local identifier or title (required for photos/export)
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import (
|
|||||||
"gitea.k3s.k0.nu/tools/photocli/internal/photos"
|
"gitea.k3s.k0.nu/tools/photocli/internal/photos"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var version = "dev"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
sigCh := make(chan os.Signal, 1)
|
sigCh := make(chan os.Signal, 1)
|
||||||
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
||||||
|
|||||||
@@ -106,6 +106,18 @@ func TestRunHelp(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRunVersion(t *testing.T) {
|
||||||
|
for _, cmd := range []string{"version", "--version", "-v"} {
|
||||||
|
out, _, rc := runWith([]string{cmd}, &mockBridge{})
|
||||||
|
if rc != 0 {
|
||||||
|
t.Errorf("%s: rc = %d, want 0", cmd, rc)
|
||||||
|
}
|
||||||
|
if out == "" {
|
||||||
|
t.Errorf("%s: output is empty", cmd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestRunUnknownCommand(t *testing.T) {
|
func TestRunUnknownCommand(t *testing.T) {
|
||||||
_, stderr, rc := runWith([]string{"foo"}, &mockBridge{})
|
_, stderr, rc := runWith([]string{"foo"}, &mockBridge{})
|
||||||
if rc != 1 {
|
if rc != 1 {
|
||||||
|
|||||||
Reference in New Issue
Block a user