From b6817271c7dce2c134dea12b71d33670fb4dfd6d Mon Sep 17 00:00:00 2001
From: Greg Caufield <greg@embeddedcoffee.ca>
Date: Fri, 15 Apr 2022 18:59:55 -0600
Subject: [PATCH 1/2] Bump version: 0.12.4 to 0.12.5

---
 .bumpversion.cfg                      | 4 +---
 manifest.xml                          | 2 +-
 resources/default/strings/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4ae80b6..37285de 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,10 +1,8 @@
 [bumpversion]
-current_version = 0.12.4
+current_version = 0.12.5
 commit = True
 commit_args = -S
 message = Bump version: {current_version} to {new_version}
-tag = True
-sign_tags = True
 
 [bumpversion:file:manifest.xml]
 search = <iq:application version="{current_version}"
diff --git a/manifest.xml b/manifest.xml
index c648081..fb0b6ba 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application version="0.12.4"
+    <iq:application version="0.12.5"
         entry="TogglApp"
         id="7A51BF849513496C85D874D6AB43489F"
         launcherIcon="@Drawables.LauncherIcon"
diff --git a/resources/default/strings/strings.xml b/resources/default/strings/strings.xml
index 7f0f29b..0606255 100644
--- a/resources/default/strings/strings.xml
+++ b/resources/default/strings/strings.xml
@@ -1,6 +1,6 @@
 <strings>
     <string id="AppName">TogglIQ</string>
-    <string id="Version">0.12.4</string>
+    <string id="Version">0.12.5</string>
     <string id="Compatibility">Toggl API v8</string>
     <string id="ApiKey">Toggl API Key</string>
     <string id="About">About</string>

From 9a10bae23d45628bfca9ccadc2bb006ee5f77a15 Mon Sep 17 00:00:00 2001
From: Greg Caufield <greg@embeddedcoffee.ca>
Date: Fri, 15 Apr 2022 20:40:31 -0600
Subject: [PATCH 2/2] Setup Continuous Delivery (#44)

Implement Continuous Delivery on Travis. Builds will now automatically
be triggered on a merge to main, tags are auto generated when they are
pushed

Closes #43
---
 .bumpversion.cfg |  4 ++++
 .grenrc          |  9 +++++----
 .travis.yml      | 24 ++++++++++++++++++++----
 mb_runner.sh     |  7 +++++--
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 37285de..7a7ce83 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -9,3 +9,7 @@ search = <iq:application version="{current_version}"
 replace = <iq:application version="{new_version}"
 
 [bumpversion:file:resources/default/strings/strings.xml]
+
+[bumpversion:file:.travis.yml]
+search = export VERSION={current_version}
+replace = export VERSION={new_version}
diff --git a/.grenrc b/.grenrc
index 1ea6d12..fe1fb8e 100644
--- a/.grenrc
+++ b/.grenrc
@@ -1,13 +1,14 @@
 {
-  "dataSource": "milestones",
-  "milestoneMatch": "{{tag_name}}",
+  "dataSource": "issues",
   "ignoreIssuesWith": [
     "wontfix",
     "duplicate"
   ],
-  "draft": true,
+  "prerelease": "true",
   "groupBy": {
-    "Enhancements:": ["enhancement"],
+    "Enhancements:": ["enhancement", "translations"],
+    "New Features:": ["feature"],
+    "New Devices:": ["devices"],
     "Bug Fixes:": ["bug"]
   }
 }
diff --git a/.travis.yml b/.travis.yml
index 8824769..ddd4ea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ dist: bionic
 sudo: required
 language: java
 jdk: openjdk11
+git:
+  depth: false
 before_install:
 - sudo apt-get -y install libpng16-16 libwebkit2gtk-4.0-37 zlib1g-dev libc6-dev libstdc++6
 - sudo apt-get -y install python3-pip python-dev
@@ -14,18 +16,32 @@ before_install:
 install:
 - pip3 install gdown
 - pip3 install mbpkg
+before_script:
+  - export VERSION=0.12.5
+  - export GIT_TAG=v$VERSION-rc.$TRAVIS_BUILD_NUMBER
 script:
 - "./travis.sh"
+branches:
+  except:
+    - /^v[0-9]*/
 before_deploy:
-- npm install -g github-release-notes
-- gren release --token ${GH_TOKEN} --tags $(git describe)
+  - git config --global user.email "builds@travis-ci.com"
+  - git config --global user.name "Travis CI"
+  - git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
+  - git push -q https://${GH_TOKEN}@github.com/gcaufield/TogglIQ --tags
 deploy:
   provider: releases
   api_key:
     secure: mkslwcib1t4znCWRxM6rUrkgN6UEP+n62jTH6vcjBHoTP3sXzTA2sdn13OYMxhC2IesNoDbQt45guQ0a/pdQLuIlU5W5jqAN8r5udQhFNegYVU6MgMWTMhSzi3ETBIblyOVyEKcSvguHhrhRTJRYtOvOQ1tsji3vuL4FMtScr4WDBbGjoAkavrIX9cPOhsFZ+O+xnXv/gFJN3TbMloCACT0ziFz1E4ekH/PwiIWVPVNPL90W7SUeOZX1jjRNXfwup0iT/Ud0xHYmy16SziNavGSi7JPRKBJoX6tzxPD/y+fsBvJ704YHnV/CM7UnW5tboJWB6VdBxEg9YTpDABs4+vOaj9K0sTzsbkUL+3K6i1AcX/yD/uGDrh/QKcgmRAIDv7k8m1TOnHsmiG1hJ70PYRrPo9ghjbUHg7632uqjH6KEsY7V0cNWTbixLGOviL+A38Zrz7hiB29JU6pEpf4TcC49X73QZYYPopKyESF2KwsbJ54OflGGxscoWI6+oUhTppuyvEZT3FWiF6OWtlMRO9Pc5tWem8R9urfjcAYRfngOL4TZU/Twl6qE1fav6ffzI71D+kYV1Sa8y5rKQR7LSVo0w0l2FDlP/pRgvgZVMn2DlINKV26BVZOWZLCyVRzaa+ARzYw1IifsCIG9X/+PWou+ZtnhJEyKXajUG6kr3Eg=
   on:
-    tags: true
+    tags: false
+    branch: main
   skip_cleanup: 'true'
-  draft: true
+  draft: false
+  prerelease: true
   file_glob: true
   file: bin/*.iq
+after_deploy:
+  - npm install -g github-release-notes
+  - gren release -P --token ${GH_TOKEN} --tags=$(git describe --abbrev=0 --tags)..$(git describe --abbrev=0 --tags --exclude=*-rc*) --override
+
diff --git a/mb_runner.sh b/mb_runner.sh
index b7f54f9..b09df25 100755
--- a/mb_runner.sh
+++ b/mb_runner.sh
@@ -169,8 +169,11 @@ function params_for_build
 
 function params_for_package
 {
-    GIT_VER=$(git describe --long --dirty)
-    PARAMS+="--output \"${OUT_DIR}/${APP_NAME}-${GIT_VER}.iq\" "
+    if [[ -z "${GIT_TAG}" ]]; then
+      GIT_TAG=$(git describe --long --dirty)
+    fi
+
+    PARAMS+="--output \"${OUT_DIR}/${APP_NAME}-${GIT_TAG}.iq\" "
     PARAMS+="--private-key \"${MB_PRIVATE_KEY}\" "
 
     PARAMS+="--package-app "