Skip to content

Commit d041930

Browse files
bang9bang9
committed
ci/cd: update macos resource class
1 parent 04fa93d commit d041930

File tree

6 files changed

+94
-93
lines changed

6 files changed

+94
-93
lines changed

‎.circleci/config.yml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
### Aliases
22
aliases:
33
- &restore_node_modules_base
4-
key: yarn-base-{{ arch }}-{{ checksum "yarn.lock" }}-v1
4+
key: yarn-base-{{ arch }}-{{ checksum "yarn.lock" }}-v2
55
- &restore_node_modules_packages
6-
key: yarn-packages-{{ arch }}-{{ checksum "yarn.lock" }}-v1
6+
key: yarn-packages-{{ arch }}-{{ checksum "yarn.lock" }}-v2
77
- &install_node_modules
8-
name: Install node_modules
9-
command: yarn install --frozen-lockfiles
8+
name: Install node_modules
9+
command: yarn install --frozen-lockfiles
1010
- &save_node_modules_base
11-
key: yarn-base-{{ arch }}-{{ checksum "yarn.lock" }}-v1
12-
paths:
13-
- ~/.cache/yarn
14-
- node_modules
11+
key: yarn-base-{{ arch }}-{{ checksum "yarn.lock" }}-v2
12+
paths:
13+
- ~/.cache/yarn
14+
- node_modules
1515
- &save_node_modules_packages
16-
key: yarn-packages-{{ arch }}-{{ checksum "yarn.lock" }}-v1
17-
paths:
18-
- sample/node_modules
19-
- packages/uikit-chat-hooks/node_modules
20-
- packages/uikit-react-native/node_modules
21-
- packages/uikit-react-native-foundation/node_modules
22-
- packages/uikit-utils/node_modules
16+
key: yarn-packages-{{ arch }}-{{ checksum "yarn.lock" }}-v2
17+
paths:
18+
- sample/node_modules
19+
- packages/uikit-chat-hooks/node_modules
20+
- packages/uikit-react-native/node_modules
21+
- packages/uikit-react-native-foundation/node_modules
22+
- packages/uikit-utils/node_modules
2323
- &create_app_env
24-
name: Create env.ts
25-
command: echo "export const APP_ID = '${SENDBIRD_APP_ID}';" >> sample/src/env.ts
24+
name: Create env.ts
25+
command: echo "export const APP_ID = '${SENDBIRD_APP_ID}';" >> sample/src/env.ts
2626

2727
### Circle CI
2828
# https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
@@ -31,6 +31,7 @@ version: 2.1
3131
orbs:
3232
ruby: circleci/[email protected]
3333
macos: circleci/macos@2
34+
3435
parameters:
3536
platform:
3637
type: enum
@@ -40,12 +41,12 @@ parameters:
4041
jobs:
4142
deploy-ios:
4243
macos:
43-
xcode: 13.3.0
44-
resource_class: large
44+
xcode: 14.0.1
45+
resource_class: macos.x86.medium.gen2
4546
steps:
4647
- checkout
4748
- macos/switch-ruby:
48-
version: '2.7.5'
49+
version: '2.7.6'
4950
- ruby/install-deps:
5051
key: gems-ios
5152
app-dir: ./sample/ios
@@ -55,13 +56,13 @@ jobs:
5556
- save_cache: *save_node_modules_base
5657
- save_cache: *save_node_modules_packages
5758
- restore_cache:
58-
key: pods-{{ arch }}-{{ checksum "sample/ios/Podfile.lock" }}
59+
key: pods-{{ arch }}-{{ checksum "sample/ios/Podfile.lock" }}-v2
5960
- run:
6061
name: Install pods
6162
working_directory: sample/ios
6263
command: bundle exec pod install
6364
- save_cache:
64-
key: pods-{{ arch }}-{{ checksum "sample/ios/Podfile.lock" }}
65+
key: pods-{{ arch }}-{{ checksum "sample/ios/Podfile.lock" }}-v2
6566
paths:
6667
- sample/ios/Pods
6768
- run: *create_app_env
@@ -87,7 +88,7 @@ jobs:
8788
steps:
8889
- checkout
8990
- ruby/install:
90-
version: '2.7.5'
91+
version: '2.7.6'
9192
- ruby/install-deps:
9293
key: gems-android
9394
app-dir: ./sample/android

‎sample/.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.5
1+
2.7.6

‎sample/android/Gemfile.lock‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ GEM
88
artifactory (3.0.15)
99
atomos (0.1.3)
1010
aws-eventstream (1.2.0)
11-
aws-partitions (1.713.0)
12-
aws-sdk-core (3.170.0)
11+
aws-partitions (1.734.0)
12+
aws-sdk-core (3.171.0)
1313
aws-eventstream (~> 1, >= 1.0.2)
1414
aws-partitions (~> 1, >= 1.651.0)
1515
aws-sigv4 (~> 1.5)
1616
jmespath (~> 1, >= 1.6.1)
17-
aws-sdk-kms (1.62.0)
17+
aws-sdk-kms (1.63.0)
1818
aws-sdk-core (~> 3, >= 3.165.0)
1919
aws-sigv4 (~> 1.1)
20-
aws-sdk-s3 (1.119.1)
20+
aws-sdk-s3 (1.119.2)
2121
aws-sdk-core (~> 3, >= 3.165.0)
2222
aws-sdk-kms (~> 1)
2323
aws-sigv4 (~> 1.4)
@@ -66,7 +66,7 @@ GEM
6666
faraday_middleware (1.2.0)
6767
faraday (~> 1.0)
6868
fastimage (2.2.6)
69-
fastlane (2.211.0)
69+
fastlane (2.212.1)
7070
CFPropertyList (>= 2.3, < 4.0.0)
7171
addressable (>= 2.8, < 3.0.0)
7272
artifactory (~> 3.0)
@@ -105,12 +105,12 @@ GEM
105105
xcodeproj (>= 1.13.0, < 2.0.0)
106106
xcpretty (~> 0.3.0)
107107
xcpretty-travis-formatter (>= 0.0.3)
108-
fastlane-plugin-firebase_app_distribution (0.3.3)
108+
fastlane-plugin-firebase_app_distribution (0.5.0)
109109
fastlane-plugin-json (1.1.0)
110-
fastlane-plugin-versioning_android (0.1.0)
110+
fastlane-plugin-versioning_android (0.1.1)
111111
gh_inspector (1.1.3)
112-
google-apis-androidpublisher_v3 (0.34.0)
113-
google-apis-core (>= 0.9.1, < 2.a)
112+
google-apis-androidpublisher_v3 (0.37.0)
113+
google-apis-core (>= 0.11.0, < 2.a)
114114
google-apis-core (0.11.0)
115115
addressable (~> 2.5, >= 2.5.1)
116116
googleauth (>= 0.16.2, < 2.a)
@@ -120,18 +120,18 @@ GEM
120120
retriable (>= 2.0, < 4.a)
121121
rexml
122122
webrick
123-
google-apis-iamcredentials_v1 (0.16.0)
124-
google-apis-core (>= 0.9.1, < 2.a)
125-
google-apis-playcustomapp_v1 (0.12.0)
126-
google-apis-core (>= 0.9.1, < 2.a)
123+
google-apis-iamcredentials_v1 (0.17.0)
124+
google-apis-core (>= 0.11.0, < 2.a)
125+
google-apis-playcustomapp_v1 (0.13.0)
126+
google-apis-core (>= 0.11.0, < 2.a)
127127
google-apis-storage_v1 (0.19.0)
128128
google-apis-core (>= 0.9.0, < 2.a)
129129
google-cloud-core (1.6.0)
130130
google-cloud-env (~> 1.0)
131131
google-cloud-errors (~> 1.0)
132132
google-cloud-env (1.6.0)
133133
faraday (>= 0.17.3, < 3.0)
134-
google-cloud-errors (1.3.0)
134+
google-cloud-errors (1.3.1)
135135
google-cloud-storage (1.44.0)
136136
addressable (~> 2.8)
137137
digest-crc (~> 0.4)
@@ -140,7 +140,7 @@ GEM
140140
google-cloud-core (~> 1.6)
141141
googleauth (>= 0.16.2, < 2.a)
142142
mini_mime (~> 1.0)
143-
googleauth (1.3.0)
143+
googleauth (1.5.0)
144144
faraday (>= 0.17.3, < 3.a)
145145
jwt (>= 1.4, < 3.0)
146146
memoist (~> 0.16)
@@ -163,7 +163,7 @@ GEM
163163
naturally (2.2.1)
164164
optparse (0.1.1)
165165
os (1.1.4)
166-
plist (3.6.0)
166+
plist (3.7.0)
167167
public_suffix (5.0.1)
168168
rake (13.0.6)
169169
representable (3.2.0)
@@ -213,6 +213,7 @@ GEM
213213

214214
PLATFORMS
215215
arm64-darwin-21
216+
arm64-darwin-22
216217
x86_64-linux
217218

218219
DEPENDENCIES

‎sample/ios/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

33
gem "fastlane"
4-
gem "cocoapods", "= 1.11.3"
4+
gem "cocoapods", "= 1.12.0"
55

66
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
77
eval_gemfile(plugins_path) if File.exist?(plugins_path)

‎sample/ios/Gemfile.lock‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (6.1.5)
6+
activesupport (7.0.4.3)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
1211
addressable (2.8.1)
1312
public_suffix (>= 2.0.2, < 6.0)
1413
algoliasearch (1.27.5)
@@ -17,43 +16,43 @@ GEM
1716
artifactory (3.0.15)
1817
atomos (0.1.3)
1918
aws-eventstream (1.2.0)
20-
aws-partitions (1.713.0)
21-
aws-sdk-core (3.170.0)
19+
aws-partitions (1.734.0)
20+
aws-sdk-core (3.171.0)
2221
aws-eventstream (~> 1, >= 1.0.2)
2322
aws-partitions (~> 1, >= 1.651.0)
2423
aws-sigv4 (~> 1.5)
2524
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.62.0)
25+
aws-sdk-kms (1.63.0)
2726
aws-sdk-core (~> 3, >= 3.165.0)
2827
aws-sigv4 (~> 1.1)
29-
aws-sdk-s3 (1.119.1)
28+
aws-sdk-s3 (1.119.2)
3029
aws-sdk-core (~> 3, >= 3.165.0)
3130
aws-sdk-kms (~> 1)
3231
aws-sigv4 (~> 1.4)
3332
aws-sigv4 (1.5.2)
3433
aws-eventstream (~> 1, >= 1.0.2)
3534
babosa (1.0.4)
3635
claide (1.1.0)
37-
cocoapods (1.11.3)
36+
cocoapods (1.12.0)
3837
addressable (~> 2.8)
3938
claide (>= 1.0.2, < 2.0)
40-
cocoapods-core (= 1.11.3)
39+
cocoapods-core (= 1.12.0)
4140
cocoapods-deintegrate (>= 1.0.3, < 2.0)
42-
cocoapods-downloader (>= 1.4.0, < 2.0)
41+
cocoapods-downloader (>= 1.6.0, < 2.0)
4342
cocoapods-plugins (>= 1.0.0, < 2.0)
4443
cocoapods-search (>= 1.0.0, < 2.0)
45-
cocoapods-trunk (>= 1.4.0, < 2.0)
44+
cocoapods-trunk (>= 1.6.0, < 2.0)
4645
cocoapods-try (>= 1.1.0, < 2.0)
4746
colored2 (~> 3.1)
4847
escape (~> 0.0.4)
4948
fourflusher (>= 2.3.0, < 3.0)
5049
gh_inspector (~> 1.0)
5150
molinillo (~> 0.8.0)
5251
nap (~> 1.0)
53-
ruby-macho (>= 1.0, < 3.0)
52+
ruby-macho (>= 2.3.0, < 3.0)
5453
xcodeproj (>= 1.21.0, < 2.0)
55-
cocoapods-core (1.11.3)
56-
activesupport (>= 5.0, < 7)
54+
cocoapods-core (1.12.0)
55+
activesupport (>= 5.0, < 8)
5756
addressable (~> 2.8)
5857
algoliasearch (~> 1.0)
5958
concurrent-ruby (~> 1.1)
@@ -75,7 +74,7 @@ GEM
7574
colored2 (3.1.2)
7675
commander (4.6.0)
7776
highline (~> 2.0.0)
78-
concurrent-ruby (1.1.10)
77+
concurrent-ruby (1.2.2)
7978
declarative (0.0.20)
8079
digest-crc (0.6.4)
8180
rake (>= 12.0.0, < 14.0.0)
@@ -84,7 +83,7 @@ GEM
8483
dotenv (2.8.1)
8584
emoji_regex (3.2.3)
8685
escape (0.0.4)
87-
ethon (0.15.0)
86+
ethon (0.16.0)
8887
ffi (>= 1.15.0)
8988
excon (0.99.0)
9089
faraday (1.10.3)
@@ -116,7 +115,7 @@ GEM
116115
faraday_middleware (1.2.0)
117116
faraday (~> 1.0)
118117
fastimage (2.2.6)
119-
fastlane (2.211.0)
118+
fastlane (2.212.1)
120119
CFPropertyList (>= 2.3, < 4.0.0)
121120
addressable (>= 2.8, < 3.0.0)
122121
artifactory (~> 3.0)
@@ -161,8 +160,8 @@ GEM
161160
fourflusher (2.3.1)
162161
fuzzy_match (2.0.4)
163162
gh_inspector (1.1.3)
164-
google-apis-androidpublisher_v3 (0.34.0)
165-
google-apis-core (>= 0.9.1, < 2.a)
163+
google-apis-androidpublisher_v3 (0.37.0)
164+
google-apis-core (>= 0.11.0, < 2.a)
166165
google-apis-core (0.11.0)
167166
addressable (~> 2.5, >= 2.5.1)
168167
googleauth (>= 0.16.2, < 2.a)
@@ -172,18 +171,18 @@ GEM
172171
retriable (>= 2.0, < 4.a)
173172
rexml
174173
webrick
175-
google-apis-iamcredentials_v1 (0.16.0)
176-
google-apis-core (>= 0.9.1, < 2.a)
177-
google-apis-playcustomapp_v1 (0.12.0)
178-
google-apis-core (>= 0.9.1, < 2.a)
174+
google-apis-iamcredentials_v1 (0.17.0)
175+
google-apis-core (>= 0.11.0, < 2.a)
176+
google-apis-playcustomapp_v1 (0.13.0)
177+
google-apis-core (>= 0.11.0, < 2.a)
179178
google-apis-storage_v1 (0.19.0)
180179
google-apis-core (>= 0.9.0, < 2.a)
181180
google-cloud-core (1.6.0)
182181
google-cloud-env (~> 1.0)
183182
google-cloud-errors (~> 1.0)
184183
google-cloud-env (1.6.0)
185184
faraday (>= 0.17.3, < 3.0)
186-
google-cloud-errors (1.3.0)
185+
google-cloud-errors (1.3.1)
187186
google-cloud-storage (1.44.0)
188187
addressable (~> 2.8)
189188
digest-crc (~> 0.4)
@@ -192,7 +191,7 @@ GEM
192191
google-cloud-core (~> 1.6)
193192
googleauth (>= 0.16.2, < 2.a)
194193
mini_mime (~> 1.0)
195-
googleauth (1.3.0)
194+
googleauth (1.5.0)
196195
faraday (>= 0.17.3, < 3.a)
197196
jwt (>= 1.4, < 3.0)
198197
memoist (~> 0.16)
@@ -203,15 +202,15 @@ GEM
203202
http-cookie (1.0.5)
204203
domain_name (~> 0.5)
205204
httpclient (2.8.3)
206-
i18n (1.10.0)
205+
i18n (1.12.0)
207206
concurrent-ruby (~> 1.0)
208207
jmespath (1.6.2)
209208
json (2.6.3)
210209
jwt (2.7.0)
211210
memoist (0.16.2)
212211
mini_magick (4.12.0)
213212
mini_mime (1.1.2)
214-
minitest (5.13.0)
213+
minitest (5.18.0)
215214
molinillo (0.8.0)
216215
multi_json (1.15.0)
217216
multipart-post (2.0.0)
@@ -221,7 +220,7 @@ GEM
221220
netrc (0.11.0)
222221
optparse (0.1.1)
223222
os (1.1.4)
224-
plist (3.6.0)
223+
plist (3.7.0)
225224
public_suffix (4.0.7)
226225
rake (13.0.6)
227226
representable (3.2.0)
@@ -253,7 +252,7 @@ GEM
253252
tty-cursor (~> 0.7)
254253
typhoeus (1.4.0)
255254
ethon (>= 0.9.0)
256-
tzinfo (2.0.4)
255+
tzinfo (2.0.6)
257256
concurrent-ruby (~> 1.0)
258257
uber (0.1.0)
259258
unf (0.1.4)
@@ -273,15 +272,15 @@ GEM
273272
rouge (~> 2.0.7)
274273
xcpretty-travis-formatter (1.0.1)
275274
xcpretty (~> 0.2, >= 0.0.7)
276-
zeitwerk (2.5.4)
277275

278276
PLATFORMS
279277
arm64-darwin-21
280-
x86_64-darwin-19
278+
arm64-darwin-22
281279
x86_64-darwin-21
280+
x86_64-darwin-22
282281

283282
DEPENDENCIES
284-
cocoapods (= 1.11.3)
283+
cocoapods (= 1.12.0)
285284
fastlane
286285
fastlane-plugin-json
287286
fastlane-plugin-versioning_ios

0 commit comments

Comments
 (0)