Skip to content

Tidepool sync #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LogglyService
Submodule LogglyService updated 0 files
2 changes: 1 addition & 1 deletion LoopKit
Submodule LoopKit updated 28 files
+52 −4 LoopKit.xcodeproj/project.pbxproj
+45 −14 LoopKitUI/SupportUI.swift
+0 −1 LoopKitUI/View Controllers/SettingsNavigationViewController.swift
+5 −0 LoopKitUI/Views/GuardrailConstraintedQuantityView.swift
+11 −3 LoopKitUI/Views/QuantityScheduleEditor.swift
+20 −1 LoopKitUI/Views/ScheduleEditor.swift
+1 −1 MockKit/Extensions/HKUnit.swift
+10 −2 MockKit/UnfinalizedDose.swift
+20 −0 MockKitUI/Extensions/Color.swift
+20 −0 MockKitUI/Extensions/Image.swift
+8 −0 MockKitUI/Extensions/TimeInterval.swift
+5 −4 MockKitUI/MockPumpManager+UI.swift
+5 −7 MockKitUI/MockSupport.swift
+6 −0 MockKitUI/Resources/Assets.xcassets/Colors/Contents.json
+20 −0 MockKitUI/Resources/Assets.xcassets/Colors/LightGrey.colorset/Contents.json
+12 −0 MockKitUI/Resources/Assets.xcassets/DemoPlaceholderImage.imageset/Contents.json
+ MockKitUI/Resources/Assets.xcassets/DemoPlaceholderImage.imageset/DemoPlaceholderImage-edited.png
+6 −0 MockKitUI/Resources/Assets.xcassets/Reservoir/Contents.json
+12 −0 MockKitUI/Resources/Assets.xcassets/Reservoir/generic-reservoir-mask.imageset/Contents.json
+ MockKitUI/Resources/Assets.xcassets/Reservoir/generic-reservoir-mask.imageset/generic-reservoir-fill.png
+12 −0 MockKitUI/Resources/Assets.xcassets/Reservoir/generic-reservoir.imageset/Contents.json
+ MockKitUI/Resources/Assets.xcassets/Reservoir/generic-reservoir.imageset/generic-reservoir-outline.png
+175 −0 MockKitUI/ViewModel/MockPumpManagerSettingsViewModel.swift
+51 −0 MockKitUI/ViewModifier/OpenMockPumpSettingsOnLongPressGesture.swift
+48 −0 MockKitUI/Views/DemoPlaceHolderView.swift
+177 −0 MockKitUI/Views/InsulinStatusView.swift
+37 −0 MockKitUI/Views/MockPumpManagerControlsView.swift
+255 −0 MockKitUI/Views/MockPumpManagerSettingsView.swift
2 changes: 1 addition & 1 deletion LoopSupport
16 changes: 16 additions & 0 deletions LoopWorkspace.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,16 @@
ReferencedContainer = "container:TidepoolService/TidepoolService.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "431CE7761F98564200255374"
BuildableName = "RileyLinkBLEKitTests.xctest"
BlueprintName = "RileyLinkBLEKitTests"
ReferencedContainer = "container:RileyLinkKit/RileyLinkKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
2 changes: 1 addition & 1 deletion MinimedKit
Submodule MinimedKit updated 0 files
2 changes: 1 addition & 1 deletion NightscoutService
Submodule NightscoutService updated 0 files
14 changes: 11 additions & 3 deletions Scripts/sync.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ let projects = [
Project("dexcom-share-client-swift", "dev"),
Project("RileyLinkKit", "dev"),
Project("NightscoutService", "dev"),
//Project("TrueTime.swift", "dev"),
Project("LoopOnboarding", "dev"),
Project("AmplitudeService", "dev"),
Project("LogglyService", "dev"),
Project("OmniBLE", "dev"),
Project("NightscoutRemoteCGM", "dev"),
Project("LoopSupport", "dev"),
Project("G7SensorKit", "dev"),
Project("G7SensorKit", "main"),
Project("TidepoolService", "dev"),
Project("TidepoolKit", "dev"),
Project("OmniKit", "main"),
Expand Down Expand Up @@ -96,6 +95,15 @@ for project in projects {
// Merge changes from tidepool to diy
try await repository.merge(revisionSpecification: "\(incomingRemote)/\(project.branch)", signature: signature)

let (ahead, behind) = try repository.commitsAheadBehind(other: "origin/\(project.branch)")
print("Ahead = \(ahead)")
print("Behind = \(behind)")

guard ahead > 0 else {
print("No incoming changes; skipping PR creation.")
continue
}

// Push changes up to origin
let refspec = "refs/heads/" + syncBranch + ":refs/heads/" + syncBranch
print("Pushing \(refspec) to \(project.project)")
Expand Down Expand Up @@ -130,7 +138,7 @@ extension Octokit {
draft: Bool? = nil) async throws -> PullRequest
{
return try await withCheckedThrowingContinuation { continuation in
octokit.pullRequest(owner: owner, repo: repo, title: title, head: head, headRepo: headRepo, base: base, body: body, maintainerCanModify: maintainerCanModify, draft: draft)
octokit.createPullRequest(owner: owner, repo: repo, title: title, head: head, headRepo: headRepo, base: base, body: body, maintainerCanModify: maintainerCanModify, draft: draft)
{ response in
continuation.resume(with: response)
}
Expand Down