Skip to content

Commit 2c83e83

Browse files
committed
fix(Makefile): add missing dollar sign and add assert for non empty version strings
Change-Id: I83265a11182df6d28f2ef3a5f5454adba27c95ea Signed-off-by: Thomas Kosiewski <[email protected]>
1 parent f886ea1 commit 2c83e83

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
with:
2424
fetch-depth: 1
25+
fetch-tags: true
2526
persist-credentials: false
2627

2728
- run: git fetch --tags
@@ -46,6 +47,7 @@ jobs:
4647
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4748
with:
4849
fetch-depth: 1
50+
fetch-tags: true
4951
persist-credentials: false
5052

5153
- run: git fetch --tags
@@ -70,6 +72,7 @@ jobs:
7072
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7173
with:
7274
fetch-depth: 1
75+
fetch-tags: true
7376
persist-credentials: false
7477

7578
- run: git fetch --tags

.github/workflows/release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
with:
2020
fetch-depth: 1
21+
fetch-tags: true
2122
persist-credentials: false
2223

2324
- run: git fetch --tags

Makefile

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
1111
SCHEME := Coder\ Desktop
1212
SWIFT_VERSION := 6.0
1313

14-
MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$//')
1514
CURRENT_PROJECT_VERSION=$(shell git describe --tags)
15+
ifeq ($(strip $(CURRENT_PROJECT_VERSION)),)
16+
$(error CURRENT_PROJECT_VERSION cannot be empty)
17+
endif
18+
19+
MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$$//')
20+
ifeq ($(strip $(MARKETING_VERSION)),)
21+
$(error MARKETING_VERSION cannot be empty)
22+
endif
1623

1724
# Define the keychain file name first
1825
KEYCHAIN_FILE := app-signing.keychain-db

0 commit comments

Comments
 (0)