diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34d33b3120..bac98bc36e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -121,10 +121,6 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v4 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ env.DEFAULT_RUBY_VERSION }} - bundler-cache: true - run: ./dev/ci/setup-host homebrew-packaging - run: ./dev/ci/run-tests-natively homebrew-packaging - uses: actions/upload-artifact@v4 diff --git a/dev/ci/tests/homebrew-packaging/setup b/dev/ci/tests/homebrew-packaging/setup index a1a792374c..f7d9ecb806 100644 --- a/dev/ci/tests/homebrew-packaging/setup +++ b/dev/ci/tests/homebrew-packaging/setup @@ -1,14 +1,13 @@ #!/usr/bin/env bash set -e -if ! rvm-exec system gem list | grep -qE '^rack '; then +if ! gem list | grep -qE '^rack '; then # The native packaging test runs passenger-install-*-module with the system Ruby, # which in turn requires the 'rack' gem to be installed in the system Ruby's # default RubyGems path. 'rake test:install_deps' installs to a local bundler # directory but not to the default RubyGems path. - export rvmsudo_secure_path=0 - retry_run 3 rvmsudo rvm-exec system gem install rack --no-document + retry_run 3 sudo system gem install rack --no-document fi -retry_run 3 rvm-exec system rake test:install_deps DEVDEPS_DEFAULT=no BASE_DEPS=yes SUDO=yes -retry_run 3 gem install bundler -v 1.17.2 --no-document +retry_run 3 rake test:install_deps DEVDEPS_DEFAULT=no BASE_DEPS=yes SUDO=yes +retry_run 3 gem install bundler -v '~>1.0' --no-document retry_run 3 rake test:install_deps BASE_DEPS=yes