Skip to content

Commit 50f8ef7

Browse files
authored
Revert "pin git action setup-ruby to v1.268.0 until Lambda Builders support bundler 4.0.0 (#805)" (#809)
* Revert "pin git action setup-ruby to v1.268.0 until Lambda Builders support bundler 4.0.0 (#805)" This reverts commit 719e7e9. * fix: bundler.bat -> bundle.bat
1 parent 2c605eb commit 50f8ef7

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@ jobs:
294294
- uses: actions/setup-python@v6
295295
with:
296296
python-version: ${{ matrix.python }}
297-
# Pin to specific version until Lambda Builders support bundler 4.0.0
298-
- uses: ruby/[email protected]
297+
- uses: ruby/setup-ruby@v1
299298
with:
300299
ruby-version: "3.2"
301300
- run: make init

aws_lambda_builders/workflows/ruby_bundler/bundler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self, osutils, bundler_exe=None):
3636
self.osutils = osutils
3737
if bundler_exe is None:
3838
if osutils.is_windows():
39-
bundler_exe = "bundler.bat"
39+
bundler_exe = "bundle.bat"
4040
else:
4141
bundler_exe = "bundle"
4242

tests/unit/workflows/ruby_bundler/test_bundler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_run_executes_bundler_on_windows(self):
3838
self.osutils.is_windows.side_effect = [True]
3939
self.under_test = SubprocessBundler(self.osutils)
4040
self.under_test.run(["install"])
41-
self.osutils.popen.assert_called_with(["bundler.bat", "install"], cwd=None, stderr="PIPE", stdout="PIPE")
41+
self.osutils.popen.assert_called_with(["bundle.bat", "install"], cwd=None, stderr="PIPE", stdout="PIPE")
4242

4343
def test_uses_custom_bundler_path_if_supplied(self):
4444
self.under_test.run(["install"])

0 commit comments

Comments
 (0)