From 0696d0337479614ea3175502004e6793beff21c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 8 Oct 2026 11:34:46 +0200 Subject: [PATCH] Replace the removed bundler --deployment flag Bundler 4 (shipped with Ruby 4) removed --deployment. Use 'bundle config set --local deployment true' (frozen + vendor/bundle) and the 'without' setting instead, in the Mastodon, akkounts and liquor-cabinet cookbooks. --- site-cookbooks/kosmos-akkounts/recipes/default.rb | 4 +++- site-cookbooks/kosmos-mastodon/recipes/build.rb | 4 +++- site-cookbooks/liquor_cabinet/recipes/default.rb | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb index c673d9e..f6c0336 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb @@ -298,7 +298,9 @@ execute "bundle install" do environment deploy_env user deploy_user cwd deploy_path - command "bundle install --without development,test --deployment" + command "bundle config set --local deployment true && " \ + "bundle config set --local without 'development test' && " \ + "bundle install" end execute 'rake db:migrate' do diff --git a/site-cookbooks/kosmos-mastodon/recipes/build.rb b/site-cookbooks/kosmos-mastodon/recipes/build.rb index a849bd8..2ed880f 100644 --- a/site-cookbooks/kosmos-mastodon/recipes/build.rb +++ b/site-cookbooks/kosmos-mastodon/recipes/build.rb @@ -149,7 +149,9 @@ execute "bundle install" do environment deploy_env.merge("BUNDLE_BUILD__CHARLOCK_HOLMES" => "--with-cxxflags=-std=c++17") user mastodon_user cwd mastodon_path - command "bundle install --without development,test --deployment" + command "bundle config set --local deployment true && " \ + "bundle config set --local without 'development test' && " \ + "bundle install" not_if build_uptodate end diff --git a/site-cookbooks/liquor_cabinet/recipes/default.rb b/site-cookbooks/liquor_cabinet/recipes/default.rb index f333f69..027b2fd 100644 --- a/site-cookbooks/liquor_cabinet/recipes/default.rb +++ b/site-cookbooks/liquor_cabinet/recipes/default.rb @@ -58,7 +58,9 @@ end execute "bundle install" do user deploy_user cwd deploy_path - command "#{bundle_path} install --without development,test --deployment" + command "#{bundle_path} config set --local deployment true && " \ + "#{bundle_path} config set --local without 'development test' && " \ + "#{bundle_path} install" end template "#{deploy_path}/config.yml.erb" do