Skip to content

Refreshed patches, commits, cherrypicks

b92323e
Select commit
Loading
Failed to load commit list.
Merged

ruby-3.4/3.4.8 package update #76162

Refreshed patches, commits, cherrypicks
b92323e
Select commit
Loading
Failed to load commit list.
Octo STS / staging-autofix succeeded Dec 19, 2025 in 0s

Merge report generated

Merge Report

First Commit SHA: 2fb661428f2ce7a9cc42352412413c8fdc27ae77

Embeddings Stored

Stored 1 embedding(s) in the vector index:

  • Datapoint ID: c5f69f0b-5f0c-479c-b095-d467ccb3a968
    Error: Expected commit 7a5688e2a27668e48f8d6ff4af5b2208b98a2f5e for v3_4_8, found 995b59f66677d44767ce9faac6957e5543617ff9

Patch

From b92323eb8516abc89809001b443b7703d7984917 Mon Sep 17 00:00:00 2001
From: Amber Arcadia <amber.arcadia@chainguard.dev>
Date: Fri, 19 Dec 2025 16:21:26 -0500
Subject: [PATCH] Refreshed patches, commits, cherrypicks

---
 ruby-3.4.yaml                                                 | 4 +---
 .../remove-already-provided-gems-from-gems_bundled_gems.patch | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ruby-3.4.yaml b/ruby-3.4.yaml
index a38a914c59f..b956f481b62 100644
--- a/ruby-3.4.yaml
+++ b/ruby-3.4.yaml
@@ -64,9 +64,7 @@ pipeline:
     with:
       repository: https://github.com/ruby/ruby
       tag: v${{vars.underscore-package-version}}
-      expected-commit: 7a5688e2a27668e48f8d6ff4af5b2208b98a2f5e
-      cherry-picks: |
-        ruby_3_4/fce44db5eb7baf1ddd2238254c3cf617fcfd1112: Update openssl gem to 3.3.1 for Ruby 3.4
+      expected-commit: 995b59f66677d44767ce9faac6957e5543617ff9
 
   - uses: patch
     with:
diff --git a/ruby-3.4/remove-already-provided-gems-from-gems_bundled_gems.patch b/ruby-3.4/remove-already-provided-gems-from-gems_bundled_gems.patch
index beba94f3ad7..6caee767cb0 100644
--- a/ruby-3.4/remove-already-provided-gems-from-gems_bundled_gems.patch
+++ b/ruby-3.4/remove-already-provided-gems-from-gems_bundled_gems.patch
@@ -17,7 +17,7 @@ index a5286d5..d4f50fa 100644
  power_assert        2.0.5   https://github.com/ruby/power_assert
  rake                13.2.1  https://github.com/ruby/rake
  test-unit           3.6.7   https://github.com/test-unit/test-unit
--rexml               3.4.0   https://github.com/ruby/rexml
+-rexml               3.4.4   https://github.com/ruby/rexml
  rss                 0.3.1   https://github.com/ruby/rss
  net-ftp             0.3.8   https://github.com/ruby/net-ftp
 -net-imap            0.5.8   https://github.com/ruby/net-imap