Skip to content

Commit f886ea1

Browse files
authored
fix(Makefile): remove suffix after patch number (#42)
Fixed release asset upload and version parsing Using a glob pattern, the release workflow now correctly uploads all assets from the output directory. Version parsing in the Makefile has been updated to handle pre-release tags by removing trailing pre-release identifiers. Change-Id: I15b816393880406c9ac6a7cbbd2b3344c338894c Signed-off-by: Thomas Kosiewski <[email protected]>
1 parent ddf21a7 commit f886ea1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: make release
4242

4343
- name: Upload Release Assets
44-
run: gh release upload "$RELEASE_TAG" "$out"
44+
run: gh release upload "$RELEASE_TAG" "$out"/*
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747
RELEASE_TAG: ${{ github.event.release.tag_name }}

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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//')
14+
MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$//')
1515
CURRENT_PROJECT_VERSION=$(shell git describe --tags)
1616

1717
# Define the keychain file name first

0 commit comments

Comments
 (0)