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

Pin concurrent-ruby to < 1.3.5 #23310

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Conversation

Fryguy
Copy link
Member

@Fryguy Fryguy commented Jan 16, 2025

Temporary pin down as concurrent-ruby 1.3.5 breaks Rails 7.0, and rails-core doesn't plan to ship a new 7.0 to fix it. See rails/rails#54264

@jrafanie Please review.

Temporary pin down as concurrent-ruby 1.3.5 breaks Rails 7.0, and rails-core doesn't
plan to ship a new 7.0 to fix it. See rails/rails#54264
@Fryguy
Copy link
Member Author

Fryguy commented Jan 16, 2025

@jrafanie Also please add the removal of this to your Rails 7.1 checklist.

@jrafanie jrafanie merged commit 6fba87a into ManageIQ:master Jan 16, 2025
8 checks passed
@Fryguy Fryguy deleted the pin_concurrent_ruby branch January 16, 2025 22:34
@Fryguy
Copy link
Member Author

Fryguy commented Jan 16, 2025

Backported to radjabov in commit 054b53f.

commit 054b53fe1d7cac834542d1957395a412fae1297e
Author: Joe Rafaniello <[email protected]>
Date:   Thu Jan 16 17:27:21 2025 -0500

    Merge pull request #23310 from Fryguy/pin_concurrent_ruby
    
    Pin concurrent-ruby to < 1.3.5
    
    (cherry picked from commit 6fba87a5ecbd9b44f1fbade9c69fd1517d92985e)

Fryguy pushed a commit that referenced this pull request Jan 16, 2025
Pin concurrent-ruby to < 1.3.5

(cherry picked from commit 6fba87a)
Fryguy added a commit to Fryguy/manageiq that referenced this pull request Jan 16, 2025
Fryguy added a commit to Fryguy/manageiq-schema that referenced this pull request Jan 17, 2025
jrafanie added a commit to jrafanie/activerecord-id_regions that referenced this pull request Jan 21, 2025
jrafanie added a commit to jrafanie/activerecord-id_regions that referenced this pull request Jan 21, 2025
jrafanie added a commit to jrafanie/activerecord-virtual_attributes that referenced this pull request Jan 21, 2025
@Fryguy
Copy link
Member Author

Fryguy commented Jan 30, 2025

@Fryguy A conflict occurred during the backport of this pull request to morphy.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the morphy branch in order to resolve this.

Conflict details:

diff --cc Gemfile
index e282d09d08,6e3da52186..0000000000
--- a/Gemfile
+++ b/Gemfile
@@@ -22,21 -21,28 +22,30 @@@ manageiq_plugin "manageiq-schema
  
  # Unmodified gems
  gem "activerecord-session_store",       "~>2.0"
 -gem "activerecord-virtual_attributes",  "~>7.0.0"
 +gem "activerecord-virtual_attributes",  "~>3.0.0"
  gem "acts_as_tree",                     "~>2.7" # acts_as_tree needs to be required so that it loads before ancestry
 -gem "ancestry",                         "~>4.1.0",           :require => false
 -gem "awesome_spawn",                    "~>1.6",             :require => false
 +gem "ancestry",                         "~>3.0.7",           :require => false
  gem "aws-sdk-s3",                       "~>1.0",             :require => false # For FileDepotS3
  gem "bcrypt",                           "~> 3.1.10",         :require => false
 -gem "bootsnap",                         ">= 1.8.1",          :require => false # for psych 3.3.2+ / 4 unsafe_load
 -gem "bundler",                          "~> 2.2", ">= 2.2.15", *("!= 2.5.0".."!= 2.5.9"), "!= 2.5.19", :require => false
 +gem "bundler",                          "~> 2.1", ">= 2.1.4", "!= 2.2.10", "< 2.5", :require => false # bundler 2.5 dropped support for Ruby 2.x
  gem "byebug",                                                :require => false
  gem "color",                            "~>1.8"
++<<<<<<< HEAD
 +gem "config",                           "~>2.2", ">=2.2.3",  :require => false
 +gem "dalli",                            "=2.7.6",            :require => false
 +gem "default_value_for",                "~>3.3"
++=======
+ gem "config",                           "~>5.1",             :require => false
+ gem "connection_pool",                                       :require => false # For Dalli
+ gem "concurrent-ruby",                  "< 1.3.5",           :require => false # Temporary pin down as concurrent-ruby 1.3.5 breaks Rails 7.0, and rails-core doesn't
+                                                                                # plan to ship a new 7.0 to fix it. See https://github.com/rails/rails/pull/54264
+ gem "dalli",                            "~>3.2.3",           :require => false
+ gem "default_value_for",                "~>4.0"
++>>>>>>> 6fba87a5ec (Merge pull request #23310 from Fryguy/pin_concurrent_ruby)
  gem "docker-api",                       "~>1.33.6",          :require => false
 -gem "drb",                              "~>2.2",             :require => false
  gem "elif",                             "=0.1.0",            :require => false
 -gem "fast_gettext",                     "~>3.1"
 -gem "ffi",                              "< 1.17.0",          :require => false
 -gem "gettext_i18n_rails",               "~>1.11"
 +gem "fast_gettext",                     "~>2.0.1"
 +gem "gettext_i18n_rails",               "~>1.7.2"
  gem "gettext_i18n_rails_js",            "~>1.3.0"
  gem "hamlit",                           "~>2.11.0"
  gem "inifile",                          "~>3.0",             :require => false

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants