Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEBUGGING: Bump Ruby to 3.1.3 #36205

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
931f53b
Bump ruby version to 3.2.0
Feb 6, 2023
051ce0f
Bump Xcode to 14.2.0 and ruby to 3.1.3
Feb 7, 2023
e4873e1
Use new image build for macos
Feb 7, 2023
35263a2
vendorize gems installation
Feb 7, 2023
b246e00
debug
Feb 8, 2023
caf1322
more debug
Feb 9, 2023
3a6de53
Add setup_ruby step to install correct version of Bundler after switc…
traviswimer Feb 16, 2023
e95c06f
print debug info in case bundler update doesn't fix it
traviswimer Feb 16, 2023
7d05787
Bump ruby version to 3.2.0
Feb 6, 2023
5171cdb
Bump Xcode to 14.2.0 and ruby to 3.1.3
Feb 7, 2023
a082bb4
Use new image build for macos
Feb 7, 2023
a82e46d
vendorize gems installation
Feb 7, 2023
ba7bc43
debug
Feb 8, 2023
ccacdb4
more debug
Feb 9, 2023
340b93d
Add setup_ruby step to install correct version of Bundler after switc…
traviswimer Feb 16, 2023
3a7027c
print debug info in case bundler update doesn't fix it
traviswimer Feb 16, 2023
208eb67
Merge branch 'main' of github.com:traviswimer/react-native-ruby-bump …
traviswimer Feb 18, 2023
540d691
Adds step to install correct Ruby version if it doesn't already exist
traviswimer Feb 18, 2023
af5a13b
Upgrades python version to match MacOS image version
traviswimer Feb 18, 2023
ef528aa
Fix for "realpath: command not found" error
traviswimer Feb 18, 2023
2d85a22
Adds `setup_ruby` step to `test_ios_rntester` job
traviswimer Feb 18, 2023
37910fb
Attempts to fix bundler errors for prepare_package_for_release and te…
traviswimer Feb 19, 2023
f1ba5a0
Prevents script form exiting before it should.
traviswimer Feb 20, 2023
9bd8211
Makes "bundle install" use correct Gemfile.
traviswimer Feb 20, 2023
0c30bc4
Debug cleanup
traviswimer Feb 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ version: 2.1

orbs:
win: circleci/windows@2.4.0
macos: circleci/macos@2.3.3

# -------------------------
# REFERENCES
Expand Down Expand Up @@ -46,7 +47,7 @@ references:
# Dependency Anchors
# -------------------------
dependency_versions:
xcode_version: &xcode_version "14.0.1"
xcode_version: &xcode_version "14.2.0"
nodelts_image: &nodelts_image "cimg/node:18.12.1"
nodeprevlts_image: &nodeprevlts_image "cimg/node:16.18.1"

Expand Down Expand Up @@ -158,12 +159,19 @@ commands:

setup_ruby:
steps:
- run:
name: Install Ruby (if not already installed by default)
command: "[ -d ~/.rbenv/versions/3.1.3 ] || rbenv install 3.1.3"
- restore_cache:
key: *gems_cache_key
- macos/switch-ruby:
version: "3.1.3"
- run:
name: Install Bundler for the current version of Ruby
command: gem install bundler
- run:
name: Bundle Install
command: |
source /usr/local/share/chruby/auto.sh
bundle check || bundle install --path vendor/bundle --clean
- save_cache:
key: *gems_cache_key
Expand Down Expand Up @@ -593,11 +601,7 @@ jobs:
- run:
name: "Brew: Tap wix/brew"
command: brew tap wix/brew
- run:
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just added in a PR (#36192), but it seems the python installation is no longer causing CI tests to break. Instead, this brew unlink command was throwing an error.

# Python 3.10 already exists in the environment, this is a workaround for:
# https://github.com/actions/setup-python/issues/577
name: "Unlink environment's Python 3.10"
command: brew unlink python@3.10

- brew_install:
package: applesimutils watchman

Expand Down Expand Up @@ -969,7 +973,10 @@ jobs:
export USE_HERMES=0
fi

cd packages/rn-tester && bundle exec pod install
cd packages/rn-tester
gem install bundler
bundle check || bundle install --path vendor/bundle --clean
bundle exec pod install

- run:
name: Build RNTester
Expand Down Expand Up @@ -1403,6 +1410,11 @@ jobs:
- "1f:c7:61:c4:e2:ff:77:e3:cc:ca:a7:34:c2:79:e3:3c"
- brew_install:
package: cmake
# `realpath` command is not included with MacOS 12 (Monterey). `coreutils` is used to install this command.
# It should be safe to remove this once CircleCI upgrades the MacOS image to a newer version.
# https://apple.stackexchange.com/a/450116
- brew_install:
package: coreutils
- run:
name: "Set new react-native version and commit changes"
command: |
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.3
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
CFPropertyList (3.0.6)
rexml
activesupport (6.1.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -54,9 +54,9 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.0)
escape (0.0.4)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.15.5)
fourflusher (2.3.1)
Expand All @@ -65,7 +65,7 @@ GEM
httpclient (2.8.3)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
json (2.6.2)
json (2.6.3)
minitest (5.17.0)
molinillo (0.8.0)
nanaimo (0.3.0)
Expand Down Expand Up @@ -95,7 +95,7 @@ DEPENDENCIES
cocoapods (~> 1.11, >= 1.11.3)

RUBY VERSION
ruby 2.7.6p219
ruby 3.1.3p185

BUNDLED WITH
2.3.22
2.3.26
5 changes: 4 additions & 1 deletion scripts/update_podfile_lock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ validate_env () {

update_pods () {
cd "$RNTESTER_DIR" || exit
bundle check || exit
bundle env
gem install bundler
bundle env
bundle check || bundle install --path vendor/bundle --clean
bundle exec pod install
cd "$THIS_DIR" || exit
}
2 changes: 1 addition & 1 deletion template/_ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.3