Tidepool sync

ps2 · ps2 · commit d65d6fe74fc4 · 2023-09-08T16:02:49.000-05:00
diff --git a/G7SensorKit b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 87946c727a61f0434c2c0da0e807b1671aafdd72
+Subproject commit aa1b7db34efd42b1cb1b7fde8558f3f5def20ff1
diff --git a/LibreTransmitter b/LibreTransmitter
@@ -1 +1 @@
-Subproject commit 4616e69d9891e876886d7f5557b921a76d042cf5
+Subproject commit 9ba5dc606f0989c01970c925cd01b009edff6651
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit 2360edb508ff95b910184326cbeb7ff43f91e0fc
+Subproject commit 6226289f4e102d8a4664f9a621ecdf83d5b4c45d
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 9d43c3870e991864123617d564af658b973f2e7e
+Subproject commit e28c6a06b90790b9e4faa6c701639575d0bfc575
diff --git a/LoopOnboarding b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit c548ad9ed39f91f1473de6babce103aa893bc389
+Subproject commit 150edeb898cd5a0088427da3ce54342fd0494593
diff --git a/MinimedKit b/MinimedKit
@@ -1 +1 @@
-Subproject commit f9cc1eca1e6f89190ca2679cd0630b6767f18be4
+Subproject commit f1ac5712a4b5d23ae4cf7273a6b8cef3acf1a290
diff --git a/NightscoutService b/NightscoutService
@@ -1 +1 @@
-Subproject commit 2b7e4f855c3169bf05c6c6b9293f0127bc1b6de6
+Subproject commit 10e757c58184ac824ee5f6a58096ebe98553aa40
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit a7649013573847e1d108340ee6ec99f7ecacef98
+Subproject commit 2822d18e783c2bd6dcd45b87d5aebb97b7621d51
diff --git a/OmniKit b/OmniKit
@@ -1 +1 @@
-Subproject commit b0de08e3a5916daf8a01936908d755f2497bb061
+Subproject commit a5aec1c12dfdee8a25d914c1e4fea8ccc5968fd4
diff --git a/Scripts/sync.swift b/Scripts/sync.swift
@@ -8,7 +8,7 @@ import Cocoa
 import AsyncSwiftGit // @bdewey
 import OctoKit // nerdishbynature/octokit.swift == main
 
-let createPRs = false
+let createPRs = true
 
 guard CommandLine.arguments.count == 3 else {
     print("usage: sync.swift <pull-request-title> <branch-name>")
@@ -106,7 +106,7 @@ for project in projects {
 
     // Create and checkout the branch where sync changesets will go ("tidepool-sync")
     if !(try repository.branchExists(named: syncBranch)) {
-        try repository.createBranch(named: syncBranch, target: project.branch)
+        try repository.createBranch(named: syncBranch, target: "origin/\(project.branch)")
     }
     try await repository.checkout(revspec: syncBranch)
 
@@ -120,7 +120,8 @@ for project in projects {
         print("No incoming changes; skipping PR creation.")
 	try await repository.checkout(revspec: project.branch)
         continue
-    }
+    } 
+    print("Found diffs: \(diff)")
 
     // Push changes up to origin
     let refspec = "refs/heads/" + syncBranch + ":refs/heads/" + syncBranch
diff --git a/Scripts/update_submodule_refs.sh b/Scripts/update_submodule_refs.sh
@@ -8,6 +8,7 @@ for project in ${projects}; do
   echo "Updating to $branch on $user/$project"
   cd $dir
   git checkout $branch
+  #git branch -D tidepool-sync
   git pull
   cd -
 done
diff --git a/TidepoolService b/TidepoolService
@@ -1 +1 @@
-Subproject commit 6c746b0aa11c788c9c27362a1e95bfc631d328a2
+Subproject commit 3ee7d9423126b56da1c7371293040ed6b98d2d6a
