diff --git a/.circleci/config.yml b/.circleci/config.yml index 170ed583ec0..896df666d5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,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" @@ -177,15 +177,18 @@ commands: if [[ -z "$(command -v rbenv)" ]]; then brew install rbenv ruby-build + # Load and init rbenv + (rbenv init 2> /dev/null) || true + echo '' >> ~/.bash_profile + echo 'eval "$(rbenv init - bash)"' >> ~/.bash_profile + source ~/.bash_profile else echo "rbenv found; Skipping installation" fi - # Load and init rbenv - (rbenv init 2> /dev/null) || true - echo '' >> ~/.bash_profile - echo 'eval "$(rbenv init - bash)"' >> ~/.bash_profile - source ~/.bash_profile + brew reinstall libyaml + gem install psych -- --with-libyaml-dir=$(brew --prefix libyaml) + export RUBY_CONFIGURE_OPTS=--with-libyaml-dir=$(brew --prefix libyaml) # Install the right version of ruby if [[ -z "$(rbenv versions | grep << parameters.ruby_version >>)" ]]; then @@ -194,6 +197,7 @@ commands: # Set ruby dependencies rbenv global << parameters.ruby_version >> + gem install bundler bundle check || bundle install --path vendor/bundle --clean - save_cache: key: *rbenv_cache_key @@ -632,11 +636,6 @@ jobs: - run: name: "Brew: Tap wix/brew" command: brew tap wix/brew - - run: - # 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 diff --git a/Gemfile.lock b/Gemfile.lock index 2dfa05917c3..8c7d3138e14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,13 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml - activesupport (6.1.7.2) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) @@ -16,15 +15,15 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.11.3) + cocoapods (1.12.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.12.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -32,10 +31,10 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) + ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + cocoapods-core (1.12.0) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -54,9 +53,9 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) escape (0.0.4) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) ffi (1.15.5) fourflusher (2.3.1) @@ -65,8 +64,8 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - json (2.6.2) - minitest (5.17.0) + json (2.6.3) + minitest (5.18.0) molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) @@ -85,17 +84,16 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) - zeitwerk (2.6.6) PLATFORMS ruby DEPENDENCIES activesupport (>= 6.1.7.1) - cocoapods (~> 1.11, >= 1.11.3) + cocoapods (~> 1.12) RUBY VERSION - ruby 2.7.6p219 + ruby 3.2.0p0 BUNDLED WITH - 2.3.22 + 2.4.7