mirror of
https://github.com/ditatompel/xmr-remote-nodes.git
synced 2024-12-22 19:49:25 +00:00
fix: Invalid main branch name
Our main branch is `main`, not `master`.
This commit is contained in:
parent
0d72dd9995
commit
05d4182723
2 changed files with 1 additions and 2 deletions
2
Makefile
2
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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue