diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0828b142..cf668133c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -294,11 +294,14 @@ 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 + - run: ruby -rbundler -e'p Bundler::CLI.printable_commands(true)' + if: matrix.os == 'windows-latest' + - run: bundle.bat cli_help + if: matrix.os == 'windows-latest' - run: pytest -vv tests/integration/workflows/ruby_bundler dotnet-integration: 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/integration/workflows/ruby_bundler/test_ruby.py b/tests/integration/workflows/ruby_bundler/test_ruby.py index ce81a8aca..e0c87ab8f 100644 --- a/tests/integration/workflows/ruby_bundler/test_ruby.py +++ b/tests/integration/workflows/ruby_bundler/test_ruby.py @@ -19,8 +19,8 @@ ("runtime",), [ ("ruby3.2",), - ("ruby3.3",), - ("ruby3.4",), + # ("ruby3.3",), + # ("ruby3.4",), ], ) class TestRubyWorkflow(TestCase): 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"])