Merge pull request #7794 from dependabot/deivid-rodriguez/run-group-vendor-tests

Make sure Bundler group vendoring smoke tests get actually run, and pass

Author: deivid-rodriguez

.github/workflows/smoke.yml

@@ -84,6 +84,13 @@ jobs:
             - 'common/**'
             - 'updater/**'
             - 'bundler/**'
+          bundler-group-vendoring:
+            - .github/workflows/smoke.yml
+            - .dockerignore
+            - Dockerfile.updater-core
+            - 'common/**'
+            - 'updater/**'
+            - 'bundler/**'
           cargo:
             - .github/workflows/smoke.yml
             - .dockerignore

bundler/helpers/v2/lib/functions/lockfile_updater.rb

@@ -92,13 +92,17 @@ def cache_vendored_gems(definition)
     def prune_gem_cache(resolve, cache_path, updated_gems)
       cached_gems = Dir["#{cache_path}/*.gem"]
 
-      outdated_gems = cached_gems.reject do |path|
+      outdated_gems = cached_gems.select do |path|
         spec = Bundler.rubygems.spec_from_gem path
 
-        !updated_gems.include?(spec.name) || resolve.any? do |s|
+        caused_by_update = updated_gems.include?(spec.name) && resolve.none? do |s|
           s.name == spec.name && s.version == spec.version &&
             !s.source.is_a?(Bundler::Source::Git)
         end
+
+        caused_by_removal = resolve.none? { |s| s.name == spec.name }
+
+        caused_by_update || caused_by_removal
       end
 
       return unless outdated_gems.any?