From 9370b0a50b1acc47e6f23d25685b44dc57110fe7 Mon Sep 17 00:00:00 2001 From: Thomas Kosiewski Date: Wed, 12 Feb 2025 16:01:59 +0100 Subject: [PATCH] fix(Makefile): add missing dollar sign and add assert for non empty version strings Change-Id: I83265a11182df6d28f2ef3a5f5454adba27c95ea Signed-off-by: Thomas Kosiewski --- .github/workflows/ci.yml | 15 ++++++--------- .github/workflows/release.yml | 5 ++--- Makefile | 9 ++++++++- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d06a294..2ec0d9f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,10 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - fetch-depth: 1 + fetch-depth: 0 + fetch-tags: true persist-credentials: false - - run: git fetch --tags - - name: Switch XCode Version uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 with: @@ -45,11 +44,10 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - fetch-depth: 1 + fetch-depth: 0 + fetch-tags: true persist-credentials: false - - run: git fetch --tags - - name: Switch XCode Version uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 with: @@ -69,11 +67,10 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - fetch-depth: 1 + fetch-depth: 0 + fetch-tags: true persist-credentials: false - - run: git fetch --tags - - name: Setup Nix uses: ./.github/actions/nix-devshell diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8371068..4c2e8780 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,11 +17,10 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - fetch-depth: 1 + fetch-depth: 0 + fetch-tags: true persist-credentials: false - - run: git fetch --tags - - name: Switch XCode Version uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 with: diff --git a/Makefile b/Makefile index 9c1cc714..81fe6723 100644 --- 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 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy