Commitd2ed4a9

authored

fix(Makefile): add version validation checks (#44)

Signed-off-by: Thomas Kosiewski <tk@coder.com>

1 parentb8d110a commitd2ed4a9Copy full SHA for d2ed4a9

File tree

+16

-13

lines changed

+16

-13

lines changed

Lines changed: 6 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,10 @@ jobs:`
`21`	`21`	`-name:Checkout`
`22`	`22`	`uses:actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683# v4.2.2`
`23`	`23`	`with:`
`24`		`-fetch-depth:1`
	`24`	`+fetch-depth:0`
	`25`	`+fetch-tags:true`
`25`	`26`	`persist-credentials:false`
`26`	`27`
`27`		`- -run:git fetch --tags`
`28`		`-`
`29`	`28`	`-name:Switch XCode Version`
`30`	`29`	`uses:maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd# v1.6.0`
`31`	`30`	`with:`
`@@ -45,11 +44,10 @@ jobs:`
`45`	`44`	`-name:Checkout`
`46`	`45`	`uses:actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683# v4.2.2`
`47`	`46`	`with:`
`48`		`-fetch-depth:1`
	`47`	`+fetch-depth:0`
	`48`	`+fetch-tags:true`
`49`	`49`	`persist-credentials:false`
`50`	`50`
`51`		`- -run:git fetch --tags`
`52`		`-`
`53`	`51`	`-name:Switch XCode Version`
`54`	`52`	`uses:maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd# v1.6.0`
`55`	`53`	`with:`
`@@ -69,11 +67,10 @@ jobs:`
`69`	`67`	`-name:Checkout`
`70`	`68`	`uses:actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683# v4.2.2`
`71`	`69`	`with:`
`72`		`-fetch-depth:1`
	`70`	`+fetch-depth:0`
	`71`	`+fetch-tags:true`
`73`	`72`	`persist-credentials:false`
`74`	`73`
`75`		`- -run:git fetch --tags`
`76`		`-`
`77`	`74`	`-name:Setup Nix`
`78`	`75`	`uses:./.github/actions/nix-devshell`
`79`	`76`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,10 @@ jobs:`
`17`	`17`	`-name:Checkout`
`18`	`18`	`uses:actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683# v4.2.2`
`19`	`19`	`with:`
`20`		`-fetch-depth:1`
	`20`	`+fetch-depth:0`
	`21`	`+fetch-tags:true`
`21`	`22`	`persist-credentials:false`
`22`	`23`
`23`		`- -run:git fetch --tags`
`24`		`-`
`25`	`24`	`-name:Switch XCode Version`
`26`	`25`	`uses:maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd# v1.6.0`
`27`	`26`	`with:`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,15 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj`
`11`	`11`	`SCHEME := Coder\ Desktop`
`12`	`12`	`SWIFT_VERSION := 6.0`
`13`	`13`
`14`		`-MARKETING_VERSION=$(shell git describe --tags --abbrev=0 \| sed 's/^v//' \| sed 's/-.*$//')`
`15`	`14`	`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`
`16`	`23`
`17`	`24`	`# Define the keychain file name first`
`18`	`25`	`KEYCHAIN_FILE := app-signing.keychain-db`

Comments

(0)