Merge branch 'stable' into devicetest

adamjakab · Jun 29, 2024 · 670c877 · 670c877
2 parents 6a4c3ce + b051ac4
commit 670c877
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/test_release_deploy.yml b/.github/workflows/test_release_deploy.yml
@@ -46,7 +46,7 @@ jobs:
     needs: test
     name: Release
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/stable'
+    if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@v4
       - name: Package App

diff --git a/manifest.xml b/manifest.xml
@@ -1,5 +1,5 @@
 <iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application version="2.1.8" entry="iHIIT" id="5fa082b017864e7fa1f3ec51bb340e8a" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="1.4.0" name="@Strings.app_name" type="watch-app">
+    <iq:application version="2.2.0" entry="iHIIT" id="5fa082b017864e7fa1f3ec51bb340e8a" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="1.4.0" name="@Strings.app_name" type="watch-app">
         <iq:products>
             <iq:product id="approachs60"/>
             <iq:product id="approachs62"/>

diff --git a/source/iHIIT.mc b/source/iHIIT.mc
@@ -20,8 +20,8 @@ class iHIIT extends App.AppBase {
 
   // Return the initial view of the application
   public function getInitialView() {
-    // return controller.getInitialApplicationView();
-    return controller.getInitialApplicationTestView();
+    return controller.getInitialApplicationView();
+    // return controller.getInitialApplicationTestView();
   }
 
   // Hook called on application start up