diff --git a/.github/workflows/build_trio.yml b/.github/workflows/build_trio.yml
index ae2dad720..e2d02d08c 100644
--- a/.github/workflows/build_trio.yml
+++ b/.github/workflows/build_trio.yml
@@ -10,7 +10,7 @@ on:
- cron: "0 8 * * 3" # Checks for updates at 08:00 UTC every Wednesday
- cron: "0 6 1 * *" # Builds the app on the 1st of every month at 06:00 UTC
-env:
+env:
UPSTREAM_REPO: nightscout/Trio
UPSTREAM_BRANCH: ${{ github.ref_name }} # branch on upstream repository to sync from (replace with specific branch name if needed)
TARGET_BRANCH: ${{ github.ref_name }} # target branch on fork to be kept in sync, and target branch on upstream to be kept alive (replace with specific branch name if needed)
@@ -181,7 +181,7 @@ jobs:
echo "Synchronizing your fork of Trio
with the upstream repository nightscout/Trio
will be skipped." >> $GITHUB_STEP_SUMMARY
echo "If you want to enable automatic builds and updates for your Trio, please follow the instructions \
under the following path Trio/fastlane/testflight.md
." >> $GITHUB_STEP_SUMMARY
-
+
# Builds Trio
build:
name: Build
@@ -199,7 +199,7 @@ jobs:
steps:
- name: Select Xcode version
run: "sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer"
-
+
- name: Checkout Repo for syncing
if: |
needs.check_alive_and_permissions.outputs.WORKFLOW_PERMISSION == 'true' &&
@@ -265,6 +265,9 @@ jobs:
- name: Install Project Dependencies
run: bundle install
+ - name: Fix DanaKit double insulin entries
+ run: git apply danakit.patch
+
# Sync the GitHub runner clock with the Windows time server (workaround as suggested in https://github.com/actions/runner/issues/2996)
- name: Sync clock
run: sudo sntp -sS time.windows.com
diff --git a/danakit.patch b/danakit.patch
new file mode 100644
index 000000000..97f318ac8
--- /dev/null
+++ b/danakit.patch
@@ -0,0 +1,24 @@
+Submodule DanaKit contains modified content
+diff --git a/DanaKit/DanaKit/PumpManager/DanaKitPumpManager.swift b/DanaKit/DanaKit/PumpManager/DanaKitPumpManager.swift
+index d795d59..88ca56b 100644
+--- a/DanaKit/DanaKit/PumpManager/DanaKitPumpManager.swift
++++ b/DanaKit/DanaKit/PumpManager/DanaKitPumpManager.swift
+@@ -556,18 +556,6 @@ extension DanaKitPumpManager: PumpManager {
+ self.state.bolusState = .inProgress
+ self.notifyStateDidChange()
+
+- DispatchQueue.main.async {
+- let dose = self.doseEntry?.toDoseEntry(isMutable: true)
+-
+- if let dose = dose {
+- self.pumpDelegate.notify { (delegate) in
+- delegate?.pumpManager(self, hasNewPumpEvents: [NewPumpEvent.bolus(dose: dose, units: dose.programmedUnits)], lastReconciliation: Date.now, replacePendingEvents: false, completion: { _ in })
+- }
+-
+- self.notifyStateDidChange()
+- }
+- }
+-
+ completion(nil)
+ } catch {
+ self.state.bolusState = .noBolus