mirror of
https://github.com/kopia/kopia.git
synced 2026-05-08 06:42:51 -04:00
kopia-ui: don't package linux app yet, fix version numbering
This commit is contained in:
14
app/Makefile
14
app/Makefile
@@ -2,10 +2,11 @@ SHELL:=/bin/bash
|
||||
REPO_OWNER=kopia
|
||||
|
||||
electron_builder_flags:=
|
||||
electron_publish_flag:=never
|
||||
|
||||
ifeq ($(TRAVIS_PULL_REQUEST),false)
|
||||
|
||||
electron_builder_flags+=-p always
|
||||
electron_publish_flag=always
|
||||
|
||||
ifneq ($(TRAVIS_TAG),)
|
||||
# tagged release - create draft release, but don't publish
|
||||
@@ -15,7 +16,7 @@ electron_builder_flags+=-c.publish.owner=$(REPO_OWNER)
|
||||
electron_builder_flags+=-c.publish.repo=kopia
|
||||
else
|
||||
# post-submit run, create a release in another repo
|
||||
electron_builder_flags+=-c.extraMetadata.version=$(shell date +%y%m%d.%H.%M)-pre-$(shell echo $(TRAVIS_COMMIT) | cut -b 1-8)
|
||||
electron_builder_flags+=-c.extraMetadata.version=$(shell date +%y%m%d%H%M.$(TRAVIS_BUILD_NUMBER).0)-pre-$(shell echo $(TRAVIS_COMMIT) | cut -b 1-8)
|
||||
electron_builder_flags+=-c.publish.owner=$(REPO_OWNER)
|
||||
electron_builder_flags+=-c.publish.repo=kopia-ui-release
|
||||
electron_builder_flags+=-c.publish.releaseType=release
|
||||
@@ -25,7 +26,6 @@ else
|
||||
|
||||
# not running on Travis, or Travis in PR mode, don't build installer and don't publish
|
||||
electron_builder_flags+=--dir
|
||||
electron_builder_flags+=-p never
|
||||
|
||||
endif
|
||||
|
||||
@@ -35,6 +35,12 @@ undefine CSC_LINK
|
||||
undefine CSC_KEY_PASSWORD
|
||||
endif
|
||||
|
||||
ifeq ($(TRAVIS_OS_NAME),linux)
|
||||
# no packaging on Linux yet.
|
||||
electron_builder_flags+=--dir
|
||||
electron_publish_flag=never
|
||||
endif
|
||||
|
||||
dev: node_modules
|
||||
$(npm) $(npm_flags) run dev
|
||||
|
||||
@@ -45,7 +51,7 @@ build-html: node_modules
|
||||
$(npm) $(npm_flags) run build-html
|
||||
|
||||
build-electron: node_modules build-html
|
||||
$(npm) $(npm_flags) run build-electron -- $(electron_builder_flags)
|
||||
$(npm) $(npm_flags) run build-electron -- $(electron_builder_flags) -p $(electron_publish_flag)
|
||||
|
||||
include ../tools/tools.mk
|
||||
|
||||
|
||||
Reference in New Issue
Block a user