Move --all and --all-platforms to env vars

Specified as CLI options raises warnings about configuration persisting.
alphagov · Feb 23, 2024 · af46518 · af46518
1 parent 4638dd3
commit af46518
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/package_builder.rb b/lib/package_builder.rb
@@ -225,7 +225,7 @@ def latest_key
   end
 
   def package_gems
-    args = %w[bundle package --all --all-platforms --no-install]
+    args = %w[bundle package --no-install]
 
     info "Packaging gems ..."
     with_build_env do
@@ -478,6 +478,8 @@ def with_build_env
     # https://github.com/rubygems/bundler/issues/5863
     env = Bundler.original_env
     env["BUNDLE_SPECIFIC_PLATFORM"] = "true"
+    env["BUNDLE_CACHE_ALL"] = "true"
+    env["BUNDLE_CACHE_ALL_PLATFORMS"] = "true"
 
     # Ensure that we pick up the archive's Gemfile
     env.delete("BUNDLE_GEMFILE")