Skip to content

Commit 950d59c

Browse files
committed
chore: upgrade Ruby to 3.4.1 and fix CocoaPods on Blacksmith runners
Blacksmith macOS images ship Ruby 3.4, which removed the 'kconv' stdlib that xcodeproj 1.27.0 still requires. The Rock Remote Build - iOS job failed because remote-build-ios.yml never ran ruby/setup-ruby, so it inherited whatever Ruby the image shipped. - Bump .ruby-version from 3.3.4 to 3.4.1 (first stable release in the 3.4 line; upstream 3.4.0 reports as '3.4.0dev' which fails bundler's '>= 3.4.0' check) - Add gem 'nkf' to the Gemfile to replace the removed 'kconv' stdlib - Raise Gemfile ruby constraint to >= 3.4.1 - Add ruby/setup-ruby step to remote-build-ios.yml so the Rock action uses the pinned Ruby instead of the image default - Regenerate Gemfile.lock under the new toolchain Made-with: Cursor
1 parent 7d73cd8 commit 950d59c

4 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/remote-build-ios.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ jobs:
4545
with:
4646
IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
4747

48+
- name: Setup Ruby
49+
# v1.229.0
50+
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252
51+
with:
52+
bundler-cache: true
53+
4854
- name: Checkout specific Mobile-Expensify PR
4955
if: ${{ matrix.is_hybrid_build && github.event.inputs.mobile_expensify_pr }}
5056
run: |

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.4
1+
3.4.1

Gemfile

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

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby ">= 3.3.4"
4+
ruby ">= 3.4.1"
55

66
gem "cocoapods", "= 1.16.2"
77
gem 'activesupport', '>= 7.2.3.1'
@@ -19,3 +19,4 @@ gem 'bigdecimal'
1919
gem 'logger'
2020
gem 'benchmark'
2121
gem 'mutex_m'
22+
gem 'nkf'

Gemfile.lock

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ GEM
260260
nap (1.1.0)
261261
naturally (2.3.0)
262262
netrc (0.11.0)
263+
nkf (0.2.0)
263264
openssl (3.3.1)
264265
optparse (0.8.1)
265266
os (1.1.4)
@@ -331,12 +332,13 @@ DEPENDENCIES
331332
fastlane-plugin-firebase_app_distribution
332333
logger
333334
mutex_m
335+
nkf
334336
openssl (>= 3.3.1)
335337
xcodeproj (~> 1.27)
336338
xcpretty (~> 0)
337339

338340
RUBY VERSION
339-
ruby 3.3.4p94
341+
ruby 3.4.1p0
340342

341343
BUNDLED WITH
342344
2.6.9

0 commit comments

Comments
 (0)