From 28aab656fcdb5a25bcc0f11aae3cd87c3d331ec5 Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Wed, 19 Feb 2020 23:56:43 -0800
Subject: [PATCH] kopia-ui: more version number tweaks, enable snapcraft on
 travis

---
 .travis.yml  | 4 ++++
 app/Makefile | 8 +-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c753f5978..f738803a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ addons:
   apt:
     packages:
     - rpm
+addons:
+  snaps:
+    - name: snapcraft
+      confinement: classic
 before_install:
 - |-
     case $TRAVIS_OS_NAME in
diff --git a/app/Makefile b/app/Makefile
index 25a728cc0..54fe67c11 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -16,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).0.$(TRAVIS_BUILD_NUMBER)-pre-$(shell echo $(TRAVIS_COMMIT) | cut -b 1-8)
+electron_builder_flags+=-c.extraMetadata.version=$(shell date +%Y%m%d).0.$(TRAVIS_BUILD_NUMBER)
 electron_builder_flags+=-c.publish.owner=$(REPO_OWNER)
 electron_builder_flags+=-c.publish.repo=kopia-ui-release
 electron_builder_flags+=-c.publish.releaseType=release
@@ -35,12 +35,6 @@ 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