diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ef9e88..e837106 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 23ad5a8..9c1cc71 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