Skip to content

Commit c9148a4

Browse files
iDustbiniDustbin
authored
Merge branch 'LoopKit:main' into main
2 parents f45fcd1 + ddb4eae commit c9148a4

26 files changed

Lines changed: 134 additions & 61 deletions

‎.github/workflows/add_identifiers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
identifiers:
1313
name: Add Identifiers
1414
needs: validate
15-
runs-on: macos-15
15+
runs-on: macos-26
1616
steps:
1717
# Checks-out the repo
1818
- name: Checkout Repo
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
# Patch Fastlane Match to not print tables
2222
- name: Patch Match Tables

‎.github/workflows/build_loop.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
if: |
9191
steps.workflow-permission.outputs.has_permission == 'true' &&
9292
(vars.SCHEDULED_BUILD != 'false' || vars.SCHEDULED_SYNC != 'false')
93-
uses: actions/checkout@v4
93+
uses: actions/checkout@v5
9494
with:
9595
token: ${{ secrets.GH_PAT }}
9696

@@ -100,7 +100,7 @@ jobs:
100100
steps.workflow-permission.outputs.has_permission == 'true' &&
101101
vars.SCHEDULED_SYNC != 'false' && github.repository_owner != 'LoopKit'
102102
id: sync
103-
uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1
103+
uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.2
104104
with:
105105
target_sync_branch: ${{ env.TARGET_BRANCH }}
106106
shallow_since: 6 months ago
@@ -165,7 +165,7 @@ jobs:
165165
build:
166166
name: Build
167167
needs: [check_certs, check_status]
168-
runs-on: macos-15
168+
runs-on: macos-26
169169
permissions:
170170
contents: write
171171
if:
@@ -175,10 +175,10 @@ jobs:
175175
(vars.SCHEDULED_SYNC != 'false' && needs.check_status.outputs.NEW_COMMITS == 'true' )
176176
steps:
177177
- name: Select Xcode version
178-
run: "sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer"
178+
run: "sudo xcode-select --switch /Applications/Xcode_26.2.app/Contents/Developer"
179179

180180
- name: Checkout Repo for building
181-
uses: actions/checkout@v4
181+
uses: actions/checkout@v5
182182
with:
183183
token: ${{ secrets.GH_PAT }}
184184
submodules: recursive
@@ -255,7 +255,7 @@ jobs:
255255
# Upload Build artifacts
256256
- name: Upload build log, IPA and Symbol artifacts
257257
if: always()
258-
uses: actions/upload-artifact@v4
258+
uses: actions/upload-artifact@v6
259259
with:
260260
name: build-artifacts
261261
path: |

‎.github/workflows/create_certs.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
create_certs:
2323
name: Certificates
2424
needs: validate
25-
runs-on: macos-15
25+
runs-on: macos-26
2626
outputs:
2727
new_certificate_needed: ${{ steps.set_output.outputs.new_certificate_needed }}
2828

2929
steps:
3030
# Checks-out the repo
3131
- name: Checkout Repo
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

3434
# Patch Fastlane Match to not print tables
3535
- name: Patch Match Tables
@@ -63,7 +63,8 @@ jobs:
6363
id: set_output
6464
run: |
6565
CERT_STATUS_FILE="${{ github.workspace }}/fastlane/new_certificate_needed.txt"
66-
ENABLE_NUKE_CERTS=${{ vars.ENABLE_NUKE_CERTS }}
66+
ENABLE_NUKE_CERTS=$(echo "${{ vars.ENABLE_NUKE_CERTS }}" | tr '[:upper:]' '[:lower:]')
67+
FORCE_NUKE_CERTS=$(echo "${{ vars.FORCE_NUKE_CERTS }}" | tr '[:upper:]' '[:lower:]')
6768
6869
if [ -f "$CERT_STATUS_FILE" ]; then
6970
CERT_STATUS=$(cat "$CERT_STATUS_FILE" | tr -d '\n' | tr -d '\r') # Read file content and strip newlines
@@ -82,22 +83,22 @@ jobs:
8283
echo "::error::❌ No valid distribution certificate found. Automated renewal of certificates was skipped because the repository variable ENABLE_NUKE_CERTS is not set to 'true'."
8384
exit 1
8485
fi
85-
# Check if vars.FORCE_NUKE_CERTS is not set to true
86-
if [ vars.FORCE_NUKE_CERTS = "true" ]; then
86+
# Check if FORCE_NUKE_CERTS is set to true
87+
if [ "$FORCE_NUKE_CERTS" = "true" ]; then
8788
echo "::warning::‼️ Nuking of certificates was forced because the repository variable FORCE_NUKE_CERTS is set to 'true'."
8889
fi
8990
# Nuke Certs if needed, and if the repository variable ENABLE_NUKE_CERTS is set to 'true', or if FORCE_NUKE_CERTS is set to 'true', which will always force certs to be nuked
9091
nuke_certs:
9192
name: Nuke certificates
9293
needs: [validate, create_certs]
93-
runs-on: macos-15
94+
runs-on: macos-26
9495
if: ${{ (needs.create_certs.outputs.new_certificate_needed == 'true' && vars.ENABLE_NUKE_CERTS == 'true') || vars.FORCE_NUKE_CERTS == 'true' }}
9596
steps:
9697
- name: Output from step id 'check_certs'
9798
run: echo "new_certificate_needed=${{ needs.create_certs.outputs.new_certificate_needed }}"
9899

99100
- name: Checkout repository
100-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
101102

102103
- name: Install dependencies
103104
run: bundle install

‎.github/workflows/validate_secrets.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
validate-fastlane-secrets:
106106
name: Fastlane
107107
needs: [validate-access-token]
108-
runs-on: macos-15
108+
runs-on: macos-26
109109
env:
110110
GH_PAT: ${{ secrets.GH_PAT }}
111111
GH_TOKEN: ${{ secrets.GH_PAT }}
@@ -116,7 +116,7 @@ jobs:
116116
TEAMID: ${{ secrets.TEAMID }}
117117
steps:
118118
- name: Checkout Repo
119-
uses: actions/checkout@v4
119+
uses: actions/checkout@v5
120120

121121
- name: Install Project Dependencies
122122
run: bundle install

‎AmplitudeService‎

‎CGMBLEKit‎

‎G7SensorKit‎

‎Gemfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
source "https://rubygems.org"
2-
3-
gem "fastlane", "2.230.0"
2+
gem "fastlane", "2.232.1"

‎Gemfile.lock‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,27 @@ GEM
88
artifactory (3.0.17)
99
atomos (0.1.3)
1010
aws-eventstream (1.4.0)
11-
aws-partitions (1.1200.0)
12-
aws-sdk-core (3.240.0)
11+
aws-partitions (1.1206.0)
12+
aws-sdk-core (3.241.4)
1313
aws-eventstream (~> 1, >= 1.3.0)
1414
aws-partitions (~> 1, >= 1.992.0)
1515
aws-sigv4 (~> 1.9)
1616
base64
1717
bigdecimal
1818
jmespath (~> 1, >= 1.6.1)
1919
logger
20-
aws-sdk-kms (1.118.0)
21-
aws-sdk-core (~> 3, >= 3.239.1)
20+
aws-sdk-kms (1.121.0)
21+
aws-sdk-core (~> 3, >= 3.241.4)
2222
aws-sigv4 (~> 1.5)
23-
aws-sdk-s3 (1.209.0)
24-
aws-sdk-core (~> 3, >= 3.234.0)
23+
aws-sdk-s3 (1.211.0)
24+
aws-sdk-core (~> 3, >= 3.241.3)
2525
aws-sdk-kms (~> 1)
2626
aws-sigv4 (~> 1.5)
2727
aws-sigv4 (1.12.1)
2828
aws-eventstream (~> 1, >= 1.0.2)
2929
babosa (1.0.4)
3030
base64 (0.2.0)
31+
benchmark (0.5.0)
3132
bigdecimal (4.0.1)
3233
claide (1.1.0)
3334
colored (1.2)
@@ -42,16 +43,17 @@ GEM
4243
dotenv (2.8.1)
4344
emoji_regex (3.2.3)
4445
excon (0.112.0)
45-
faraday (1.8.0)
46+
faraday (1.10.5)
4647
faraday-em_http (~> 1.0)
4748
faraday-em_synchrony (~> 1.0)
4849
faraday-excon (~> 1.1)
49-
faraday-httpclient (~> 1.0.1)
50+
faraday-httpclient (~> 1.0)
51+
faraday-multipart (~> 1.0)
5052
faraday-net_http (~> 1.0)
51-
faraday-net_http_persistent (~> 1.1)
53+
faraday-net_http_persistent (~> 1.0)
5254
faraday-patron (~> 1.0)
5355
faraday-rack (~> 1.0)
54-
multipart-post (>= 1.2, < 3)
56+
faraday-retry (~> 1.0)
5557
ruby2_keywords (>= 0.0.4)
5658
faraday-cookie_jar (0.0.8)
5759
faraday (>= 0.8.0)
@@ -60,22 +62,25 @@ GEM
6062
faraday-em_synchrony (1.0.1)
6163
faraday-excon (1.1.0)
6264
faraday-httpclient (1.0.1)
65+
faraday-multipart (1.2.0)
66+
multipart-post (~> 2.0)
6367
faraday-net_http (1.0.2)
6468
faraday-net_http_persistent (1.2.0)
6569
faraday-patron (1.0.0)
6670
faraday-rack (1.0.0)
6771
faraday_middleware (1.2.1)
6872
faraday (~> 1.0)
6973
fastimage (2.4.0)
70-
fastlane (2.230.0)
74+
fastlane (2.232.1)
7175
CFPropertyList (>= 2.3, < 4.0.0)
7276
abbrev (~> 0.1.2)
7377
addressable (>= 2.8, < 3.0.0)
7478
artifactory (~> 3.0)
75-
aws-sdk-s3 (~> 1.0)
79+
aws-sdk-s3 (~> 1.197)
7680
babosa (>= 1.0.3, < 2.0.0)
7781
base64 (~> 0.2.0)
78-
bundler (>= 1.12.0, < 3.0.0)
82+
benchmark (>= 0.1.0)
83+
bundler (>= 1.17.3, < 5.0.0)
7984
colored (~> 1.2)
8085
commander (~> 4.6)
8186
csv (~> 3.3)
@@ -90,7 +95,7 @@ GEM
9095
gh_inspector (>= 1.1.2, < 2.0.0)
9196
google-apis-androidpublisher_v3 (~> 0.3)
9297
google-apis-playcustomapp_v1 (~> 0.1)
93-
google-cloud-env (>= 1.6.0, < 2.0.0)
98+
google-cloud-env (>= 1.6.0, <= 2.1.1)
9499
google-cloud-storage (~> 1.31)
95100
highline (~> 2.0)
96101
http-cookie (~> 1.0.5)
@@ -103,6 +108,7 @@ GEM
103108
naturally (~> 2.2)
104109
nkf (~> 0.2.0)
105110
optparse (>= 0.1.1, < 1.0.0)
111+
ostruct (>= 0.1.0)
106112
plist (>= 3.1.0, < 4.0.0)
107113
rubyzip (>= 2.0.0, < 3.0.0)
108114
security (= 0.1.5)
@@ -174,8 +180,9 @@ GEM
174180
nkf (0.2.0)
175181
optparse (0.8.1)
176182
os (1.1.4)
183+
ostruct (0.6.3)
177184
plist (3.7.2)
178-
public_suffix (7.0.0)
185+
public_suffix (7.0.2)
179186
rake (13.3.1)
180187
representable (3.2.0)
181188
declarative (< 0.1.0)
@@ -224,7 +231,7 @@ PLATFORMS
224231
ruby
225232

226233
DEPENDENCIES
227-
fastlane (= 2.230.0)
234+
fastlane (= 2.232.1)
228235

229236
BUNDLED WITH
230-
2.7.2
237+
4.0.6

‎LibreTransmitter‎

0 commit comments

Comments
 (0)