Skip to content

Commit e178b10

Browse files
ps2ps2
committed
Merge branch 'dev' of https://github.com/LoopKit/LoopWorkspace into dev
2 parents cd7d332 + 2edf125 commit e178b10

File tree

6 files changed

+65
-57
lines changed

6 files changed

+65
-57
lines changed

‎.github/workflows/add_identifiers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
identifiers:
1313
name: Add Identifiers
1414
needs: validate
15-
runs-on: macos-12
15+
runs-on: macos-14
1616
steps:
1717
# Uncomment to manually select latest Xcode if needed
1818
#- name: Select Latest Xcode

‎.github/workflows/build_loop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Check for alive branch
5454
if: steps.workflow-permission.outputs.has_permission == 'true'
5555
env:
56-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56+
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
5757
run: |
5858
if [[ "$(gh api -H "Accept: application/vnd.github+json" /repos/${{ github.repository_owner }}/LoopWorkspace/branches | jq --raw-output 'any(.name=="alive")')" == "true" ]]; then
5959
echo "Branch 'alive' exists."
@@ -66,7 +66,7 @@ jobs:
6666
- name: Create alive branch
6767
if: env.ALIVE_BRANCH_EXISTS == 'false'
6868
env:
69-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
7070
run: |
7171
# Get ref for LoopKit/LoopWorkspace:dev
7272
SHA=$(curl -sS https://api.github.com/repos/${{ env.UPSTREAM_REPO }}/git/refs \
@@ -156,7 +156,7 @@ jobs:
156156
build:
157157
name: Build
158158
needs: [validate, check_alive_and_permissions, check_latest_from_upstream]
159-
runs-on: macos-13
159+
runs-on: macos-14
160160
permissions:
161161
contents: write
162162
if: | # runs if started manually, or if sync schedule is set and enabled and scheduled on the first Saturday each month, or if sync schedule is set and enabled and new commits were found

‎.github/workflows/create_certs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
certificates:
1313
name: Create Certificates
1414
needs: validate
15-
runs-on: macos-12
15+
runs-on: macos-14
1616
steps:
1717
# Uncomment to manually select latest Xcode if needed
1818
#- name: Select Latest Xcode

‎.github/workflows/validate_secrets.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [workflow_call, workflow_dispatch]
55
jobs:
66
validate-access-token:
77
name: Access
8-
runs-on: macos-13
8+
runs-on: macos-14
99
env:
1010
GH_PAT: ${{ secrets.GH_PAT }}
1111
GH_TOKEN: ${{ secrets.GH_PAT }}
@@ -74,7 +74,7 @@ jobs:
7474
validate-match-secrets:
7575
name: Match-Secrets
7676
needs: validate-access-token
77-
runs-on: macos-13
77+
runs-on: macos-14
7878
env:
7979
GH_TOKEN: ${{ secrets.GH_PAT }}
8080
steps:
@@ -112,7 +112,7 @@ jobs:
112112
validate-fastlane-secrets:
113113
name: Fastlane
114114
needs: [validate-access-token, validate-match-secrets]
115-
runs-on: macos-13
115+
runs-on: macos-14
116116
env:
117117
GH_PAT: ${{ secrets.GH_PAT }}
118118
GH_TOKEN: ${{ secrets.GH_PAT }}

‎Gemfile.lock

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
addressable (2.8.5)
7-
public_suffix (>= 2.0.2, < 6.0)
8-
artifactory (3.0.15)
8+
addressable (2.8.7)
9+
public_suffix (>= 2.0.2, < 7.0)
10+
artifactory (3.0.17)
911
atomos (0.1.3)
10-
aws-eventstream (1.2.0)
11-
aws-partitions (1.824.0)
12-
aws-sdk-core (3.181.1)
13-
aws-eventstream (~> 1, >= 1.0.2)
12+
aws-eventstream (1.3.0)
13+
aws-partitions (1.949.0)
14+
aws-sdk-core (3.200.0)
15+
aws-eventstream (~> 1, >= 1.3.0)
1416
aws-partitions (~> 1, >= 1.651.0)
15-
aws-sigv4 (~> 1.5)
17+
aws-sigv4 (~> 1.8)
1618
jmespath (~> 1, >= 1.6.1)
17-
aws-sdk-kms (1.71.0)
18-
aws-sdk-core (~> 3, >= 3.177.0)
19+
aws-sdk-kms (1.87.0)
20+
aws-sdk-core (~> 3, >= 3.199.0)
1921
aws-sigv4 (~> 1.1)
20-
aws-sdk-s3 (1.134.0)
21-
aws-sdk-core (~> 3, >= 3.181.0)
22+
aws-sdk-s3 (1.155.0)
23+
aws-sdk-core (~> 3, >= 3.199.0)
2224
aws-sdk-kms (~> 1)
23-
aws-sigv4 (~> 1.6)
24-
aws-sigv4 (1.6.0)
25+
aws-sigv4 (~> 1.8)
26+
aws-sigv4 (1.8.0)
2527
aws-eventstream (~> 1, >= 1.0.2)
2628
babosa (1.0.4)
29+
base64 (0.2.0)
2730
claide (1.1.0)
2831
colored (1.2)
2932
colored2 (3.1.2)
@@ -36,7 +39,7 @@ GEM
3639
unf (>= 0.0.5, < 1.0.0)
3740
dotenv (2.8.1)
3841
emoji_regex (3.2.3)
39-
excon (0.103.0)
42+
excon (0.109.0)
4043
faraday (1.10.3)
4144
faraday-em_http (~> 1.0)
4245
faraday-em_synchrony (~> 1.0)
@@ -65,15 +68,15 @@ GEM
6568
faraday-retry (1.0.3)
6669
faraday_middleware (1.2.0)
6770
faraday (~> 1.0)
68-
fastimage (2.2.7)
69-
fastlane (2.215.0)
71+
fastimage (2.3.1)
72+
fastlane (2.221.1)
7073
CFPropertyList (>= 2.3, < 4.0.0)
7174
addressable (>= 2.8, < 3.0.0)
7275
artifactory (~> 3.0)
7376
aws-sdk-s3 (~> 1.0)
7477
babosa (>= 1.0.3, < 2.0.0)
7578
bundler (>= 1.12.0, < 3.0.0)
76-
colored
79+
colored (~> 1.2)
7780
commander (~> 4.6)
7881
dotenv (>= 2.1.1, < 3.0.0)
7982
emoji_regex (>= 0.1, < 4.0)
@@ -85,6 +88,7 @@ GEM
8588
gh_inspector (>= 1.1.2, < 2.0.0)
8689
google-apis-androidpublisher_v3 (~> 0.3)
8790
google-apis-playcustomapp_v1 (~> 0.1)
91+
google-cloud-env (>= 1.6.0, < 2.0.0)
8892
google-cloud-storage (~> 1.31)
8993
highline (~> 2.0)
9094
http-cookie (~> 1.0.5)
@@ -93,10 +97,10 @@ GEM
9397
mini_magick (>= 4.9.4, < 5.0.0)
9498
multipart-post (>= 2.0.0, < 3.0.0)
9599
naturally (~> 2.2)
96-
optparse (~> 0.1.1)
100+
optparse (>= 0.1.1, < 1.0.0)
97101
plist (>= 3.1.0, < 4.0.0)
98102
rubyzip (>= 2.0.0, < 3.0.0)
99-
security (= 0.1.3)
103+
security (= 0.1.5)
100104
simctl (~> 1.6.3)
101105
terminal-notifier (>= 2.0.0, < 3.0.0)
102106
terminal-table (~> 3)
@@ -105,73 +109,75 @@ GEM
105109
word_wrap (~> 1.0.0)
106110
xcodeproj (>= 1.13.0, < 2.0.0)
107111
xcpretty (~> 0.3.0)
108-
xcpretty-travis-formatter (>= 0.0.3)
112+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
109113
gh_inspector (1.1.3)
110-
google-apis-androidpublisher_v3 (0.49.0)
114+
google-apis-androidpublisher_v3 (0.54.0)
111115
google-apis-core (>= 0.11.0, < 2.a)
112-
google-apis-core (0.11.1)
116+
google-apis-core (0.11.3)
113117
addressable (~> 2.5, >= 2.5.1)
114118
googleauth (>= 0.16.2, < 2.a)
115119
httpclient (>= 2.8.1, < 3.a)
116120
mini_mime (~> 1.0)
117121
representable (~> 3.0)
118122
retriable (>= 2.0, < 4.a)
119123
rexml
120-
webrick
121124
google-apis-iamcredentials_v1 (0.17.0)
122125
google-apis-core (>= 0.11.0, < 2.a)
123126
google-apis-playcustomapp_v1 (0.13.0)
124127
google-apis-core (>= 0.11.0, < 2.a)
125-
google-apis-storage_v1 (0.19.0)
126-
google-apis-core (>= 0.9.0, < 2.a)
127-
google-cloud-core (1.6.0)
128-
google-cloud-env (~> 1.0)
128+
google-apis-storage_v1 (0.29.0)
129+
google-apis-core (>= 0.11.0, < 2.a)
130+
google-cloud-core (1.6.1)
131+
google-cloud-env (>= 1.0, < 3.a)
129132
google-cloud-errors (~> 1.0)
130133
google-cloud-env (1.6.0)
131134
faraday (>= 0.17.3, < 3.0)
132135
google-cloud-errors (1.3.1)
133-
google-cloud-storage (1.44.0)
136+
google-cloud-storage (1.45.0)
134137
addressable (~> 2.8)
135138
digest-crc (~> 0.4)
136139
google-apis-iamcredentials_v1 (~> 0.1)
137-
google-apis-storage_v1 (~> 0.19.0)
140+
google-apis-storage_v1 (~> 0.29.0)
138141
google-cloud-core (~> 1.6)
139142
googleauth (>= 0.16.2, < 2.a)
140143
mini_mime (~> 1.0)
141-
googleauth (1.8.0)
144+
googleauth (1.8.1)
142145
faraday (>= 0.17.3, < 3.a)
143146
jwt (>= 1.4, < 3.0)
144147
multi_json (~> 1.11)
145148
os (>= 0.9, < 2.0)
146149
signet (>= 0.16, < 2.a)
147150
highline (2.0.3)
148-
http-cookie (1.0.5)
151+
http-cookie (1.0.6)
149152
domain_name (~> 0.5)
150153
httpclient (2.8.3)
151154
jmespath (1.6.2)
152-
json (2.6.3)
153-
jwt (2.7.1)
154-
mini_magick (4.12.0)
155+
json (2.7.2)
156+
jwt (2.8.2)
157+
base64
158+
mini_magick (4.13.1)
155159
mini_mime (1.1.5)
156160
multi_json (1.15.0)
157-
multipart-post (2.3.0)
161+
multipart-post (2.4.1)
158162
nanaimo (0.3.0)
159163
naturally (2.2.1)
160-
optparse (0.1.1)
164+
nkf (0.2.0)
165+
optparse (0.5.0)
161166
os (1.1.4)
162-
plist (3.7.0)
163-
public_suffix (5.0.3)
164-
rake (13.0.6)
167+
plist (3.7.1)
168+
public_suffix (5.1.1)
169+
rake (13.2.1)
165170
representable (3.2.0)
166171
declarative (< 0.1.0)
167172
trailblazer-option (>= 0.1.1, < 0.2.0)
168173
uber (< 0.2.0)
169174
retriable (3.1.2)
170-
rexml (3.2.6)
175+
rexml (3.2.9)
176+
strscan
171177
rouge (2.0.7)
172178
ruby2_keywords (0.0.5)
173179
rubyzip (2.3.2)
174-
security (0.1.3)
180+
security (0.1.5)
175181
signet (0.18.0)
176182
addressable (~> 2.8)
177183
faraday (>= 0.17.5, < 3.a)
@@ -180,22 +186,22 @@ GEM
180186
simctl (1.6.10)
181187
CFPropertyList
182188
naturally
189+
strscan (3.1.0)
183190
terminal-notifier (2.0.0)
184191
terminal-table (3.0.2)
185192
unicode-display_width (>= 1.1.1, < 3)
186193
trailblazer-option (0.1.2)
187194
tty-cursor (0.7.1)
188-
tty-screen (0.8.1)
195+
tty-screen (0.8.2)
189196
tty-spinner (0.9.3)
190197
tty-cursor (~> 0.7)
191198
uber (0.1.0)
192199
unf (0.1.4)
193200
unf_ext
194-
unf_ext (0.0.8.2)
195-
unicode-display_width (2.4.2)
196-
webrick (1.8.1)
201+
unf_ext (0.0.9.1)
202+
unicode-display_width (2.5.0)
197203
word_wrap (1.0.0)
198-
xcodeproj (1.22.0)
204+
xcodeproj (1.24.0)
199205
CFPropertyList (>= 2.3.3, < 4.0)
200206
atomos (~> 0.1.3)
201207
claide (>= 1.0.2, < 2.0)
@@ -210,7 +216,9 @@ GEM
210216
PLATFORMS
211217
arm64-darwin-21
212218
arm64-darwin-22
219+
arm64-darwin-23
213220
x86_64-darwin-19
221+
x86_64-linux
214222

215223
DEPENDENCIES
216224
fastlane

‎fastlane/testflight.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ This step is common for all GitHub Browser Builds; do this step only once. You w
5454

5555
1. Sign in to the [Apple developer portal page](https://developer.apple.com/account/resources/certificates/list).
5656
1. Copy the Team ID from the upper right of the screen. Record this as your `TEAMID`.
57-
1. Go to the [App Store Connect](https://appstoreconnect.apple.com/access/api) interface, click the "Keys" tab, and create a new key with "Admin" access. Give it the name: "FastLane API Key".
57+
1. Go to the [App Store Connect](https://appstoreconnect.apple.com/access/integrations/api) interface, click the "Integrations" tab, and create a new key with "Admin" access. Give it the name: "FastLane API Key".
5858
1. Record the issuer id; this will be used for `FASTLANE_ISSUER_ID`.
5959
1. Record the key id; this will be used for `FASTLANE_KEY_ID`.
6060
1. Download the API key itself, and open it in a text editor. The contents of this file will be used for `FASTLANE_KEY`. Copy the full text, including the "-----BEGIN PRIVATE KEY-----" and "-----END PRIVATE KEY-----" lines.

0 commit comments

Comments
 (0)