Skip to content
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

update submodule MinimedKit, update SHA, no change to code #326

Merged

Conversation

marionbarker
Copy link
Contributor

@marionbarker marionbarker commented Jun 19, 2024

Summary

  • update Trio workspace to point to SHA contained in trio branch for selected submodule(s) in loopandlearn

git index change

  • It is not completely obvious what the index change is in this PR (other than to see no files are changed in MinimedKit)
Trio % git diff alpha submodule_new_sha_same_code -- MinimedKit
diff --git a/MinimedKit b/MinimedKit
index 4a6df311..f11abde5 160000
--- a/MinimedKit
+++ b/MinimedKit
@@ -1 +1 @@
-Subproject commit 4a6df31192cbbddf62ed36ad78b1ca29649bd851
+Subproject commit f11abde5e2eea2cbf7ac80f3f4bc4bc6e7f6de56

And in submodule MinimedKit:

Trio % cd MinimedKit 
marion@MarionMac MinimedKit % git diff 4a6df3119 f11abde5e

no changes are reported

Details

Continue to configure loopandlearn submodules so the trio branch supports Trio workspace

  • For MinimedKit, I made another parallel PR to merge LoopKit open PR 14 (note - this changed the SHA but not the code)
    • Trio previously pointed to loopandlearn MinimedKit branch main_rc
  • For TidepoolService, I was smarter and just merged dev_rc (what Trio workspace was pointing to) into trio branch
    • The dev_rc branch already had the parallel open PR merged
    • This method updated the trio branch without modifying the SHA, so no change is needed to TidepoolService index
    • The commit history is maintained.

MikePlante1
MikePlante1 previously approved these changes Jun 20, 2024
Copy link
Contributor

@MikePlante1 MikePlante1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No actual code change, just an SHA update to switch from the main_rc branch to the trio branch on `loopandlearn/MinimedKit

Still built it via Xcode to a live phone with a 722 and successfully boluses 0.1 U. Also built via fastlane/GitHub and it's made it 18 mins in so far so I'm going to consider it a success as well.

@Sjoerd-Bo3 Sjoerd-Bo3 deleted the branch nightscout:dev July 2, 2024 14:00
@Sjoerd-Bo3 Sjoerd-Bo3 closed this Jul 2, 2024
@Sjoerd-Bo3 Sjoerd-Bo3 reopened this Jul 2, 2024
@Sjoerd-Bo3 Sjoerd-Bo3 changed the base branch from alpha to dev July 2, 2024 14:07
@Sjoerd-Bo3 Sjoerd-Bo3 dismissed MikePlante1’s stale review July 2, 2024 14:07

The base branch was changed.

Copy link
Contributor

@Sjoerd-Bo3 Sjoerd-Bo3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Sjoerd-Bo3
Copy link
Contributor

Merging with 2 approvals

@Sjoerd-Bo3 Sjoerd-Bo3 merged commit 52cc189 into nightscout:dev Jul 6, 2024
@MikePlante1 MikePlante1 mentioned this pull request Jul 16, 2024
@marionbarker marionbarker deleted the submodule_new_sha_same_code branch July 21, 2024 03:12
mountrcg pushed a commit to mountrcg/Trio that referenced this pull request Aug 1, 2024
Use same calculator on Watch as on iPhone app.
Sjoerd-Bo3 pushed a commit to Sjoerd-Bo3/Trio that referenced this pull request Aug 3, 2024
Use same calculator on Watch as on iPhone app.
Sjoerd-Bo3 pushed a commit to Sjoerd-Bo3/Trio that referenced this pull request Aug 3, 2024
This reverts changes not related to coreData for LiveActivities from commit a1c1160.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants