Skip to content

Conversation

@navels
Copy link

@navels navels commented Dec 26, 2025

Updating from latest upstream release

viraptor and others added 30 commits August 19, 2019 08:01
Add links which are exposed on rubygems and help with update automation.
This PR unifies the DelayedJob behavior of ActionMailer::Base and ActionMailer::Parameterized::Mailer

Now, the following syntax works equivalently:

```ruby
# works currently
MyMailer.delay.my_method

# this PR makes the following work
MyMailer.with(foo: 1, bar: 2).delay.my_method
```

Note that ActionMailer::Parameterized::Mailer does not inherit ActionMailer::Base (moreover, the `.with()` method returns an object instance, hence we use `include` rather than `extend`)
We can remove the rails 6.1 part when 61.0 is released
Make .delay method work with ActionMailer::Parameterized::Mailer
jruby 9.3 seems not to work with rails
```
config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly:

  * development - set it to false
  * test - set it to false (unless you use a tool that preloads your test environment)
  * production - set it to true
````
Since psych4.0, the load method has been safe_load, which causes the following error: YAML#load_dj retains the existing safeYAML support, but uses the version of psych that implements unsafe_load. In YAML#load_dj

```
  1) YAML autoloads the class of an anonymous struct
     Failure/Error:
       expect do
         yaml = "--- !ruby/struct\nn: 1\n"
         object = YAML.load(yaml)
         expect(object).to be_kind_of(Struct)
         expect(object.n).to eq(1)
       end.not_to raise_error

       expected no Exception, got #<Psych::DisallowedClass: Tried to load unspecified class: Struct> with backtrace:
         # (eval):2:in `struct'
         # ./spec/yaml_ext_spec.rb:28:in `block (3 levels) in <top (required)>'
         # ./spec/yaml_ext_spec.rb:26:in `block (2 levels) in <top (required)>'
     # ./spec/yaml_ext_spec.rb:26:in `block (2 levels) in <top (required)>'
```
net-smtp 0.3.0 dependents digest 3.0.0, but edge ruby activates 3.1.0.pre2.

The error was avoided by explicitly specifying the version in the Gemfile.

```
bundler: failed to load command: rspec (/home/runner/work/delayed_job/delayed_job/vendor/bundle/ruby/3.1.0/bin/rspec)
/home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/runtime.rb:309:in `check_for_activated_spec!': You have already activated digest 3.1.0.pre2, but your Gemfile requires digest 3.0.0. Since digest is a default gem, you can either remove your dependency on it or try updating to a newer version of bundler that supports digest as a default gem. (Gem::LoadError)
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/runtime.rb:25:in `block in setup'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/spec_set.rb:136:in `each'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/spec_set.rb:136:in `each'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/runtime.rb:24:in `map'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/runtime.rb:24:in `setup'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler.rb:149:in `setup'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/setup.rb:20:in `block in <top (required)>'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/ui/shell.rb:136:in `with_level'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/ui/shell.rb:88:in `silence'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/setup.rb:20:in `<top (required)>'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/cli/exec.rb:56:in `require_relative'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/cli/exec.rb:56:in `kernel_load'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/cli/exec.rb:23:in `run'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/cli.rb:478:in `exec'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/vendor/thor/lib/thor/command.rb:27:in `run'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/vendor/thor/lib/thor/invocation.rb:127:in `invoke_command'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/vendor/thor/lib/thor.rb:392:in `dispatch'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/cli.rb:31:in `dispatch'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/vendor/thor/lib/thor/base.rb:485:in `start'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/cli.rb:25:in `start'
	from /home/runner/.rubies/ruby-head/lib/ruby/gems/3.1.0/gems/bundler-2.3.0.dev/libexec/bundle:49:in `block in <top (required)>'
	from /home/runner/.rubies/ruby-head/lib/ruby/3.1.0/bundler/friendly_errors.rb:128:in `with_friendly_errors'
	from /home/runner/.rubies/ruby-head/lib/ruby/gems/3.1.0/gems/bundler-2.3.0.dev/libexec/bundle:37:in `<top (required)>'
	from /home/runner/.rubies/ruby-head/bin/bundle:23:in `load'
	from /home/runner/.rubies/ruby-head/bin/bundle:23:in `<main>'
```
we don't have to add digest gem explicitly.
albus522 and others added 26 commits August 13, 2024 11:50
Older versions of Ruby segfault on newer versions of Ubuntu.
…o-pr

CI: be precise regarding the Ubuntu version
Change US/Eastern => America/New_York
…blishing

Add trusted publishing workflow
@navels navels changed the title OVDX-11471 Update our delayed_job libraries from upstream OVDX-11471 Update our delayed_job library from upstream Dec 26, 2025
@navels navels merged commit fa554df into support/v4.1.13 Dec 26, 2025
2 checks passed
@navels navels deleted the ovdx-11471 branch December 26, 2025 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.