diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index c615ded60..b0a5dba22 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -40,7 +40,7 @@ jobs: echo "packaging_md5=$packaging_md5" >> $GITHUB_OUTPUT actions_md5=$(find .github -type f -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }') echo "actions_md5=$actions_md5" >> $GITHUB_OUTPUT - package_build_md5=$(echo "$go_code_md5 $package_md5 | md5sum | awk '{ print $1 }'") + package_build_md5=$(echo "$go_code_md5 $package_md5" | md5sum | awk '{ print $1 }') echo "package_build_md5=$package_build_md5" >> $GITHUB_OUTPUT cat $GITHUB_OUTPUT diff --git a/Makefile.packaging b/Makefile.packaging index 67cf546e3..7b1fd52d9 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -9,7 +9,7 @@ AZURE_PACKAGES_DIR := ./build/azure/packages BINARY_PATH := $(BUILD_DIR)/$(BINARY_NAME) GPG_PUBLIC_KEY := .key PACKAGE_RELEASE ?= 1 -PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v').$(PACKAGE_RELEASE) +PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v')-$(PACKAGE_RELEASE) TARBALL_NAME := $(PACKAGE_PREFIX)v3.tar.gz DEB_DISTROS ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11