fix(Makefile): add missing dollar sign and add assert for non empty version strings

ThomasK33 · ThomasK33 · commit 2c83e83e3d38 · 2025-02-12T16:15:07.000+01:00
Change-Id: I83265a11182df6d28f2ef3a5f5454adba27c95ea
Signed-off-by: Thomas Kosiewski &lt;tk@coder.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,6 +22,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 1
+          fetch-tags: true
           persist-credentials: false
 
       - run: git fetch --tags
@@ -46,6 +47,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 1
+          fetch-tags: true
           persist-credentials: false
 
       - run: git fetch --tags
@@ -70,6 +72,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 1
+          fetch-tags: true
           persist-credentials: false
 
       - run: git fetch --tags
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,6 +18,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 1
+          fetch-tags: true
           persist-credentials: false
 
       - run: git fetch --tags
diff --git a/Makefile b/Makefile
@@ -11,8 +11,15 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
 SCHEME := Coder\ Desktop
 SWIFT_VERSION := 6.0
 
-MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$//')
 CURRENT_PROJECT_VERSION=$(shell git describe --tags)
+ifeq ($(strip $(CURRENT_PROJECT_VERSION)),)
+    $(error CURRENT_PROJECT_VERSION cannot be empty)
+endif
+
+MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$$//')
+ifeq ($(strip $(MARKETING_VERSION)),)
+    $(error MARKETING_VERSION cannot be empty)
+endif
 
 # Define the keychain file name first
 KEYCHAIN_FILE := app-signing.keychain-db
