Merge branch 'main' into uuid-as-id

Author: driv3r

.github/workflows/build-deb.sh

@@ -8,11 +8,18 @@ sudo apt-get install -y make
 # We set this here, so it's the same between the copydb and sharding debian
 # package, and between different arch builds
 DATETIME=$(date -u +%Y%m%d)
+COMMIT_SHA=$(git rev-parse --short HEAD)
+PROJECT_BIN_TAG="-$COMMIT_SHA"
 
 git status
 
-make copydb-deb DATETIME=${DATETIME}
-make sharding-deb DATETIME=${DATETIME}
+if [[ "$1" != "--tagged-only" ]] ; then
+	make copydb-deb DATETIME=$DATETIME COMMIT_SHA=$COMMIT_SHA
+	make sharding-deb DATETIME=$DATETIME COMMIT_SHA=$COMMIT_SHA
+fi
+
+make copydb-deb DATETIME=$DATETIME COMMIT_SHA=$COMMIT_SHA PROJECT_BIN_TAG=$PROJECT_BIN_TAG
+make sharding-deb DATETIME=$DATETIME COMMIT_SHA=$COMMIT_SHA PROJECT_BIN_TAG=$PROJECT_BIN_TAG
 
 cd build
 set +x

.github/workflows/tests.yml

@@ -99,7 +99,7 @@ jobs:
           go-version: 1.24.1
 
       - name: Building Ghostferry
-        run: .github/workflows/build-deb.sh
+        run: .github/workflows/build-deb.sh --tagged-only
 
       - name: Upload debs
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

Makefile

@@ -8,7 +8,8 @@ ifndef IGNORE_DIRTY_TREE
 DIRTY_TREE      := $(shell git diff-index --quiet HEAD -- || echo '+dirty')
 endif
 
-COMMIT          := $(addsuffix $(DIRTY_TREE),$(shell git rev-parse --short HEAD))
+COMMIT_SHA      ?= $(shell git rev-parse --short HEAD)
+COMMIT          := $(addsuffix $(DIRTY_TREE),$(COMMIT_SHA))
 VERSION_STR     := $(VERSION)+$(DATETIME)+$(COMMIT)
 
 # Flags
@@ -19,7 +20,7 @@ FIRSTGOPATH     := $(firstword $(subst :, ,$(GOPATH)))
 GOBIN           := $(FIRSTGOPATH)/bin
 BUILD_DIR       := build
 DEB_PREFIX      := $(BUILD_DIR)/debian
-SHARE_DIR       := usr/share/ghostferry
+SHARE_DIR       := usr/share/ghostferry$(PROJECT_BIN_TAG)
 BIN_DIR         := usr/bin
 
 # Targets
@@ -32,7 +33,7 @@ GOTESTSUM_URL   := "https://github.com/gotestyourself/gotestsum/releases/downloa
 
 # Target specific variable, set proj to have a valid value.
 PROJECT_PKG      = ./$(proj)/cmd
-PROJECT_BIN      = ghostferry-$(proj)
+PROJECT_BIN      = ghostferry-$(proj)$(PROJECT_BIN_TAG)
 BIN_TARGET       = $(GOBIN)/$(PROJECT_BIN)
 DEB_TARGET       = $(BUILD_DIR)/$(PROJECT_BIN)_$(VERSION_STR)_$(ARCH).deb
 
@@ -46,7 +47,7 @@ $(PROJECTS): $(GOBIN)
 $(PROJECT_DEBS): LDFLAGS += -X github.com/Shopify/ghostferry.WebUiBasedir=/$(SHARE_DIR)
 $(PROJECT_DEBS): reset-deb-dir
 	$(eval proj := $(subst -deb,,$@))
-	sed -e "s/{version}/$(VERSION_STR)/" -e "s/{arch}/$(ARCH)/" $(proj)/debian/control > $(DEB_PREFIX)/DEBIAN/control
+	sed -e "s/{version}/$(VERSION_STR)/" -e "s/{arch}/$(ARCH)/" -e "s/{project}/$(PROJECT_BIN)/" $(proj)/debian/control > $(DEB_PREFIX)/DEBIAN/control
 	cp $(proj)/debian/copyright $(DEB_PREFIX)/DEBIAN/copyright
 	go build -ldflags "$(LDFLAGS)" -o $(DEB_PREFIX)/$(BIN_DIR)/$(PROJECT_BIN) $(PROJECT_PKG)
 	cp -ar webui $(DEB_PREFIX)/$(SHARE_DIR)

copydb/debian/control

@@ -1,4 +1,4 @@
-Package: ghostferry-copydb
+Package: {project}
 Version: {version}-1
 Section: misc
 Priority: optional

sharding/debian/control

@@ -1,4 +1,4 @@
-Package: ghostferry-sharding
+Package: {project}
 Version: {version}
 Section: misc
 Priority: optional