.github/workflows/build.yml

@@ -2,8 +2,6 @@ name: Build and Package OPKG
 
 on:
   push:
-    branches:
-      - main
 
 jobs:
   build:

Makefile

@@ -2,10 +2,14 @@ APP_NAME = magitrickle
 APP_DESCRIPTION = DNS-based routing application
 APP_MAINTAINER = Vladimir Avtsenov <vladimir.lsk.cool@gmail.com>
 
-TAG = $(shell git describe --tags --abbrev=0 2> /dev/null || git rev-parse --short HEAD)
 COMMIT = $(shell git rev-parse --short HEAD)
+UPSTREAM_VERSION ?= $(shell git describe --tags --abbrev=0 2> /dev/null || echo $(COMMIT))
+OPKG_REVISION = ~git$(shell date +%Y%m%d).$(COMMIT)-1
+ifeq ($(shell git rev-parse --abbrev-ref HEAD), main)
+	TAG = $(shell git describe --tags --abbrev=0 2> /dev/null || echo $(COMMIT))
 	COMMITS_SINCE_TAG = $(shell git rev-list ${TAG}..HEAD --count || echo "0")
-VERSION ?= $(TAG)
+	OPKG_REVISION = -$(shell expr $(COMMITS_SINCE_TAG) + 1)
+endif
 
 ARCH ?= mipsel
 GOOS ?= linux
@@ -16,7 +20,7 @@ GOARM ?=
 BUILD_DIR = ./.build
 PKG_DIR = $(BUILD_DIR)/$(ARCH)
 BIN_DIR = $(PKG_DIR)/data/opt/bin
-PARAMS = -v -a -trimpath -ldflags="-X 'magitrickle/constant.Version=$(VERSION)' -X 'magitrickle/constant.Commit=$(COMMIT)' -w -s"
+PARAMS = -v -a -trimpath -ldflags="-X 'magitrickle/constant.Version=$(UPSTREAM_VERSION)$(OPKG_REVISION)' -X 'magitrickle/constant.Commit=$(COMMIT)' -w -s"
 
 all: clear build_daemon package
 
@@ -30,7 +34,7 @@ package:
 	@mkdir -p $(PKG_DIR)/control
 	@echo '2.0' > $(PKG_DIR)/debian-binary
 	@echo 'Package: $(APP_NAME)' > $(PKG_DIR)/control/control
-	@echo 'Version: $(VERSION)-$(COMMITS_SINCE_TAG)' >> $(PKG_DIR)/control/control
+	@echo 'Version: $(UPSTREAM_VERSION)$(OPKG_REVISION)' >> $(PKG_DIR)/control/control
 	@echo 'Architecture: $(ARCH)' >> $(PKG_DIR)/control/control
 	@echo 'Maintainer: $(APP_MAINTAINER)' >> $(PKG_DIR)/control/control
 	@echo 'Description: $(APP_DESCRIPTION)' >> $(PKG_DIR)/control/control