From b924854747bcaf9d7cd45d571ff8ffc0fff20938 Mon Sep 17 00:00:00 2001 From: Reed Hamilton Date: Wed, 10 Dec 2025 12:21:44 -0800 Subject: [PATCH 1/2] Revert "pin git action setup-ruby to v1.268.0 until Lambda Builders support bundler 4.0.0 (#805)" This reverts commit 719e7e936853abdff4cd946a19d9a371bb8315ef. --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0828b142..f9ad67adb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -294,8 +294,7 @@ jobs: - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} - # Pin to specific version until Lambda Builders support bundler 4.0.0 - - uses: ruby/setup-ruby@v1.268.0 + - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - run: make init From 962ffde0d038f14d99c29a322684e472b4699b92 Mon Sep 17 00:00:00 2001 From: Reed Hamilton Date: Mon, 15 Dec 2025 14:41:29 -0800 Subject: [PATCH 2/2] fix: bundler.bat -> bundle.bat --- aws_lambda_builders/workflows/ruby_bundler/bundler.py | 2 +- tests/unit/workflows/ruby_bundler/test_bundler.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws_lambda_builders/workflows/ruby_bundler/bundler.py b/aws_lambda_builders/workflows/ruby_bundler/bundler.py index 27d1a0239..fe3f46859 100644 --- a/aws_lambda_builders/workflows/ruby_bundler/bundler.py +++ b/aws_lambda_builders/workflows/ruby_bundler/bundler.py @@ -36,7 +36,7 @@ def __init__(self, osutils, bundler_exe=None): self.osutils = osutils if bundler_exe is None: if osutils.is_windows(): - bundler_exe = "bundler.bat" + bundler_exe = "bundle.bat" else: bundler_exe = "bundle" diff --git a/tests/unit/workflows/ruby_bundler/test_bundler.py b/tests/unit/workflows/ruby_bundler/test_bundler.py index 4a5515cca..1b93872ac 100644 --- a/tests/unit/workflows/ruby_bundler/test_bundler.py +++ b/tests/unit/workflows/ruby_bundler/test_bundler.py @@ -38,7 +38,7 @@ def test_run_executes_bundler_on_windows(self): self.osutils.is_windows.side_effect = [True] self.under_test = SubprocessBundler(self.osutils) self.under_test.run(["install"]) - self.osutils.popen.assert_called_with(["bundler.bat", "install"], cwd=None, stderr="PIPE", stdout="PIPE") + self.osutils.popen.assert_called_with(["bundle.bat", "install"], cwd=None, stderr="PIPE", stdout="PIPE") def test_uses_custom_bundler_path_if_supplied(self): self.under_test.run(["install"])