From 45a1d01fe08ed26a4b020b8f1e28ffbffe1cf652 Mon Sep 17 00:00:00 2001 From: Thomas Kosiewski Date: Wed, 12 Feb 2025 15:18:08 +0100 Subject: [PATCH] fix(Makefile): remove suffix after patch number Change-Id: I15b816393880406c9ac6a7cbbd2b3344c338894c Signed-off-by: Thomas Kosiewski --- .github/workflows/release.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ef9e88b..e8371068 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: run: make release - name: Upload Release Assets - run: gh release upload "$RELEASE_TAG" "$out" + run: gh release upload "$RELEASE_TAG" "$out"/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RELEASE_TAG: ${{ github.event.release.tag_name }} diff --git a/Makefile b/Makefile index 23ad5a8b..9c1cc714 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj SCHEME := Coder\ Desktop SWIFT_VERSION := 6.0 -MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//') +MARKETING_VERSION=$(shell git describe --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$//') CURRENT_PROJECT_VERSION=$(shell git describe --tags) # Define the keychain file name first