Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 161ae9d

Browse files
authored
Update bash-cache, git-s3-cache, and use Xcode 14 in CI (#681)
2 parents 065ad0d + 4874543 commit 161ae9d

File tree

7 files changed

+46
-50
lines changed

7 files changed

+46
-50
lines changed

.buildkite/build-and-test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@
44
# the pipeline via the `command` node because our CI-VM setup doesn't forward
55
# the environment in that mode.
66

7-
# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
8-
gem install bundler
9-
107
build_and_test_pod

.buildkite/pipeline.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Nodes with values to reuse in the pipeline.
22
common_params:
33
plugins: &common_plugins
4-
- &bash_cache automattic/bash-cache#2.0.0: ~
4+
- automattic/bash-cache#2.8.0
55
env: &common_env
66
IMAGE_ID: xcode-13.4.1
77

@@ -22,8 +22,6 @@ steps:
2222
- label: "🔬 Validate Podspec"
2323
key: "validate"
2424
command: |
25-
# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
26-
gem install bundler
2725
validate_podspec
2826
env: *common_env
2927
plugins: *common_plugins
@@ -34,8 +32,6 @@ steps:
3432
- label: "🧹 Lint"
3533
key: "lint"
3634
command: |
37-
# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
38-
gem install bundler
3935
lint_pod
4036
env: *common_env
4137
plugins: *common_plugins

.buildkite/publish-pod.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ SPECS_REPO="[email protected]:wordpress-mobile/cocoapods-specs.git"
55
SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK
66

77
echo "--- :rubygems: Setting up Gems"
8-
# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
9-
gem install bundler
10-
118
install_gems
129

1310
echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
@@ -17,4 +14,4 @@ echo "--- :cocoapods: Publishing Pod to WP Specs Repo"
1714
publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"
1815

1916
echo "--- :slack: Notifying Slack"
20-
slack_notify_pod_published $PODSPEC_PATH $SLACK_WEBHOOK
17+
slack_notify_pod_published $PODSPEC_PATH "$SLACK_WEBHOOK"

.rubocop.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
# Opt in to new cops by default
21
AllCops:
2+
Exclude:
3+
- DerivedData/**/*
4+
- Pods/**/*
5+
- vendor/**/*
6+
# Opt in to new cops by default
37
NewCops: enable
48

59
# Allow the Podspec filename to match the project

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'cocoapods', '~> 1.10'
5+
gem 'cocoapods', '~> 1.11'
66
gem 'cocoapods-check', '~> 1.1'
77
gem 'fastlane', '~> 2.189'
88
gem 'rubocop', '~> 1.18'

Gemfile.lock

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.3)
5-
activesupport (5.2.6)
4+
CFPropertyList (3.0.5)
5+
rexml
6+
activesupport (6.1.7)
67
concurrent-ruby (~> 1.0, >= 1.0.2)
7-
i18n (>= 0.7, < 2)
8-
minitest (~> 5.1)
9-
tzinfo (~> 1.1)
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
12+
addressable (2.8.1)
13+
public_suffix (>= 2.0.2, < 6.0)
1214
algoliasearch (1.27.5)
1315
httpclient (~> 2.8, >= 2.8.3)
1416
json (>= 1.5.1)
@@ -32,11 +34,11 @@ GEM
3234
aws-sigv4 (1.2.4)
3335
aws-eventstream (~> 1, >= 1.0.2)
3436
babosa (1.0.4)
35-
claide (1.0.3)
36-
cocoapods (1.10.2)
37-
addressable (~> 2.6)
37+
claide (1.1.0)
38+
cocoapods (1.11.3)
39+
addressable (~> 2.8)
3840
claide (>= 1.0.2, < 2.0)
39-
cocoapods-core (= 1.10.2)
41+
cocoapods-core (= 1.11.3)
4042
cocoapods-deintegrate (>= 1.0.3, < 2.0)
4143
cocoapods-downloader (>= 1.4.0, < 2.0)
4244
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -47,36 +49,36 @@ GEM
4749
escape (~> 0.0.4)
4850
fourflusher (>= 2.3.0, < 3.0)
4951
gh_inspector (~> 1.0)
50-
molinillo (~> 0.6.6)
52+
molinillo (~> 0.8.0)
5153
nap (~> 1.0)
52-
ruby-macho (~> 1.4)
53-
xcodeproj (>= 1.19.0, < 2.0)
54+
ruby-macho (>= 1.0, < 3.0)
55+
xcodeproj (>= 1.21.0, < 2.0)
5456
cocoapods-check (1.1.0)
5557
cocoapods (~> 1.0)
56-
cocoapods-core (1.10.2)
57-
activesupport (> 5.0, < 6)
58-
addressable (~> 2.6)
58+
cocoapods-core (1.11.3)
59+
activesupport (>= 5.0, < 7)
60+
addressable (~> 2.8)
5961
algoliasearch (~> 1.0)
6062
concurrent-ruby (~> 1.1)
6163
fuzzy_match (~> 2.0.4)
6264
nap (~> 1.0)
6365
netrc (~> 0.11)
64-
public_suffix
66+
public_suffix (~> 4.0)
6567
typhoeus (~> 1.0)
6668
cocoapods-deintegrate (1.0.5)
67-
cocoapods-downloader (1.4.0)
69+
cocoapods-downloader (1.6.3)
6870
cocoapods-plugins (1.0.0)
6971
nap
7072
cocoapods-search (1.0.1)
71-
cocoapods-trunk (1.5.0)
73+
cocoapods-trunk (1.6.0)
7274
nap (>= 0.8, < 2.0)
7375
netrc (~> 0.11)
7476
cocoapods-try (1.2.0)
7577
colored (1.2)
7678
colored2 (3.1.2)
7779
commander (4.6.0)
7880
highline (~> 2.0.0)
79-
concurrent-ruby (1.1.9)
81+
concurrent-ruby (1.1.10)
8082
declarative (0.0.20)
8183
digest-crc (0.6.4)
8284
rake (>= 12.0.0, < 14.0.0)
@@ -85,7 +87,7 @@ GEM
8587
dotenv (2.7.6)
8688
emoji_regex (3.2.2)
8789
escape (0.0.4)
88-
ethon (0.14.0)
90+
ethon (0.15.0)
8991
ffi (>= 1.15.0)
9092
excon (0.85.0)
9193
faraday (1.7.0)
@@ -151,7 +153,7 @@ GEM
151153
xcodeproj (>= 1.13.0, < 2.0.0)
152154
xcpretty (~> 0.3.0)
153155
xcpretty-travis-formatter (>= 0.0.3)
154-
ffi (1.15.3)
156+
ffi (1.15.5)
155157
fourflusher (2.3.1)
156158
fuzzy_match (2.0.4)
157159
gh_inspector (1.1.3)
@@ -197,16 +199,16 @@ GEM
197199
http-cookie (1.0.4)
198200
domain_name (~> 0.5)
199201
httpclient (2.8.3)
200-
i18n (1.8.10)
202+
i18n (1.12.0)
201203
concurrent-ruby (~> 1.0)
202204
jmespath (1.4.0)
203-
json (2.5.1)
205+
json (2.6.2)
204206
jwt (2.2.3)
205207
memoist (0.16.2)
206208
mini_magick (4.11.0)
207209
mini_mime (1.1.0)
208-
minitest (5.14.4)
209-
molinillo (0.6.6)
210+
minitest (5.16.3)
211+
molinillo (0.8.0)
210212
multi_json (1.15.0)
211213
multipart-post (2.0.0)
212214
nanaimo (0.3.0)
@@ -218,7 +220,7 @@ GEM
218220
parser (3.0.2.0)
219221
ast (~> 2.4.1)
220222
plist (3.6.0)
221-
public_suffix (4.0.6)
223+
public_suffix (4.0.7)
222224
rainbow (3.0.0)
223225
rake (13.0.6)
224226
regexp_parser (2.1.1)
@@ -240,7 +242,7 @@ GEM
240242
unicode-display_width (>= 1.4.0, < 3.0)
241243
rubocop-ast (1.10.0)
242244
parser (>= 3.0.1.1)
243-
ruby-macho (1.4.0)
245+
ruby-macho (2.5.1)
244246
ruby-progressbar (1.11.0)
245247
ruby2_keywords (0.0.5)
246248
rubyzip (2.3.2)
@@ -255,24 +257,23 @@ GEM
255257
naturally
256258
terminal-notifier (2.0.0)
257259
terminal-table (1.6.0)
258-
thread_safe (0.3.6)
259260
trailblazer-option (0.1.1)
260261
tty-cursor (0.7.1)
261262
tty-screen (0.8.1)
262263
tty-spinner (0.9.3)
263264
tty-cursor (~> 0.7)
264265
typhoeus (1.4.0)
265266
ethon (>= 0.9.0)
266-
tzinfo (1.2.9)
267-
thread_safe (~> 0.1)
267+
tzinfo (2.0.5)
268+
concurrent-ruby (~> 1.0)
268269
uber (0.1.0)
269270
unf (0.1.4)
270271
unf_ext
271272
unf_ext (0.0.7.7)
272273
unicode-display_width (2.0.0)
273274
webrick (1.7.0)
274275
word_wrap (1.0.0)
275-
xcodeproj (1.21.0)
276+
xcodeproj (1.22.0)
276277
CFPropertyList (>= 2.3.3, < 4.0)
277278
atomos (~> 0.1.3)
278279
claide (>= 1.0.2, < 2.0)
@@ -283,17 +284,18 @@ GEM
283284
rouge (~> 2.0.7)
284285
xcpretty-travis-formatter (1.0.1)
285286
xcpretty (~> 0.2, >= 0.0.7)
287+
zeitwerk (2.6.0)
286288

287289
PLATFORMS
288290
ruby
289291
x86_64-darwin-19
290292
x86_64-darwin-20
291293

292294
DEPENDENCIES
293-
cocoapods (~> 1.10)
295+
cocoapods (~> 1.11)
294296
cocoapods-check (~> 1.1)
295297
fastlane (~> 2.189)
296298
rubocop (~> 1.18)
297299

298300
BUNDLED WITH
299-
2.2.21
301+
2.3.20

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ SPEC CHECKSUMS:
9999

100100
PODFILE CHECKSUM: 3232fd3070663c657166d850256df74f1659b46f
101101

102-
COCOAPODS: 1.10.2
102+
COCOAPODS: 1.11.3

0 commit comments

Comments
 (0)