From 05d4182723e394ea66de330cfc4966075b4ee55d Mon Sep 17 00:00:00 2001 From: Christian Ditaputratama Date: Thu, 4 Jul 2024 04:10:46 +0700 Subject: [PATCH] fix: Invalid main branch name Our main branch is `main`, not `master`. --- Makefile | 2 +- frontend/svelte.config.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 20c0923..ab5ce85 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ endif VERSION_SUFFIX := -beta.$(shell git rev-list --count HEAD).$(shell git show --no-patch --no-notes --pretty='%h' HEAD) TAG_BRANCH := .$(BRANCH) # If building HEAD or master then unset TAG_BRANCH -ifeq ($(subst HEAD,,$(subst master,,$(BRANCH))),) +ifeq ($(subst HEAD,,$(subst main,,$(BRANCH))),) TAG_BRANCH := endif # TAG is current version + commit number + commit + branch diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js index 77668b2..fd31131 100644 --- a/frontend/svelte.config.js +++ b/frontend/svelte.config.js @@ -36,7 +36,6 @@ if (BRANCH === 'HEAD' || BRANCH === 'main') { let TAG = `${VERSION}${VERSION_SUFFIX}${TAG_BRANCH}`; if (RELEASE_TAG) { TAG = RELEASE_TAG; - TAG_BRANCH = 'main'; } console.log('Building with tag', TAG);