fix: add version number to Mac packages (#11506)

influxdata · Jul 15, 2022 · 1456689 · 1456689
1 parent 2ac311c
commit 1456689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ ifdef NIGHTLY
 	deb_iteration := 0
 	tar_version := nightly
 else ifeq ($(tag),)
-	version := $(next_version)
+	version := $(next_version)~$(commit)
 	rpm_version := $(version)~$(commit)-0
 	rpm_iteration := 0
 	deb_version := $(version)~$(commit)-0
@@ -106,7 +106,7 @@ deps:
 
 .PHONY: version
 version:
-	@echo $(version)-$(commit)
+	@echo $(version)
 
 .PHONY: versioninfo
 versioninfo:

diff --git a/scripts/mac-signing.sh b/scripts/mac-signing.sh
@@ -21,6 +21,10 @@ amdFile=$(find "$HOME/project/dist" -name "*darwin_amd64.tar*")
 armFile=$(find "$HOME/project/dist" -name "*darwin_arm64.tar*")
 macFiles=("${amdFile}" "${armFile}")
 
+version=$(make version)
+plutil -insert CFBundleShortVersionString -string "$version" ~/project/info.plist
+plutil -insert CFBundleVersion -string "$version" ~/project/info.plist
+
 for tarFile in "${macFiles[@]}";
 do
   cleanup