fix(rules): Only calculate PARENT once and don't die if it's the same…

… as BRANCH
sile-typesetter · Mar 16, 2022 · fbd05f8 · fbd05f8
1 parent c1e507b
commit fbd05f8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rules/rules.mk b/rules/rules.mk
@@ -200,7 +200,7 @@ endif
 BRANCH := $(subst refs/heads/,,$(or $(CI_COMMIT_REF_NAME),$(GITHUB_HEAD_REF),$(GITHUB_REF),$(shell $(_ENV) $(GIT) rev-parse --abbrev-ref HEAD)))
 TAG := $(or $(CI_COMMIT_TAG),$(shell $(_ENV) $(GIT) describe --tags --exact-match 2>/dev/null))
 ALLTAGS := $(strip $(CI_COMMIT_TAG) $(shell $(_ENV) $(GIT) tag --points-at HEAD | $(XARGS) echo))
-PARENT ?= $(shell $(_ENV) $(GIT) merge-base $(or $(CI_MERGE_REQUEST_SOURCE_BRANCH_NAME),$(GITHUB_BASE_REF),master) $(BRANCH))
+PARENT := $(shell $(_ENV) $(GIT) merge-base $(or $(CI_MERGE_REQUEST_SOURCE_BRANCH_NAME),$(GITHUB_BASE_REF),master) $(BRANCH) 2>/dev/null)
 
 # Add mock-ups to sources
 ifeq ($(strip $(MOCKUPS)),true)