Merge commit '22dc8cb1f12492cef4ea74fcd0835f3d30c37f4b' into feature/…

…tidy-packageconfig-packagereference-separation

.github/workflows/ci.yml

@@ -15,8 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         suite:
-          - { path: bundler, name: bundler1, ecosystem: bundler }
-          - { path: bundler, name: bundler2, ecosystem: bundler }
+          - { path: bundler, name: bundler, ecosystem: bundler }
           - { path: cargo, name: cargo, ecosystem: cargo }
           - { path: common, name: common, ecosystem: common}
           - { path: composer, name: composer, ecosystem: composer }

.github/workflows/codeql-analysis.yml

@@ -56,7 +56,6 @@ jobs:
           languages: ${{ matrix.language }}
           config: |
             paths-ignore:
-              - 'bundler/spec/fixtures/projects/bundler1/invalid_ruby/Gemfile'
               - 'bundler/spec/fixtures/projects/bundler2/invalid_ruby/Gemfile'
         if: matrix.language == 'ruby'
 

.rubocop.yml

@@ -14,7 +14,6 @@ AllCops:
     - "*/spec/fixtures/**/*"
     - "vendor/**/*"
     - "dry-run/**/*"
-    - "bundler/helpers/v1/patched_bundler"
     - "bundler/helpers/spec_helpers/*"
   NewCops: enable
   TargetRubyVersion: 3.1

.rubocop_todo.yml

@@ -9,7 +9,6 @@
 # Offense count: 39
 RSpec/AnyInstance:
   Exclude:
-    - 'bundler/helpers/v1/spec/shared_contexts.rb'
     - 'bundler/spec/dependabot/bundler/update_checker_spec.rb'
     - 'common/spec/dependabot/clients/codecommit_spec.rb'
     - 'common/spec/dependabot/file_fetchers/base_spec.rb'

Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: bundler
   specs:
-    dependabot-bundler (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-bundler (0.281.0)
+      dependabot-common (= 0.281.0)
       parallel (~> 1.24)
 
 PATH
   remote: cargo
   specs:
-    dependabot-cargo (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-cargo (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: common
   specs:
-    dependabot-common (0.280.0)
+    dependabot-common (0.281.0)
       aws-sdk-codecommit (~> 1.28)
       aws-sdk-ecr (~> 1.5)
       bundler (>= 1.16, < 3.0.0)
@@ -38,107 +38,107 @@ PATH
 PATH
   remote: composer
   specs:
-    dependabot-composer (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-composer (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: devcontainers
   specs:
-    dependabot-devcontainers (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-devcontainers (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: docker
   specs:
-    dependabot-docker (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-docker (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: elm
   specs:
-    dependabot-elm (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-elm (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: git_submodules
   specs:
-    dependabot-git_submodules (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-git_submodules (0.281.0)
+      dependabot-common (= 0.281.0)
       parseconfig (~> 1.0, < 1.1.0)
 
 PATH
   remote: github_actions
   specs:
-    dependabot-github_actions (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-github_actions (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: go_modules
   specs:
-    dependabot-go_modules (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-go_modules (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: gradle
   specs:
-    dependabot-gradle (0.280.0)
-      dependabot-common (= 0.280.0)
-      dependabot-maven (= 0.280.0)
+    dependabot-gradle (0.281.0)
+      dependabot-common (= 0.281.0)
+      dependabot-maven (= 0.281.0)
 
 PATH
   remote: hex
   specs:
-    dependabot-hex (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-hex (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: maven
   specs:
-    dependabot-maven (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-maven (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: npm_and_yarn
   specs:
-    dependabot-npm_and_yarn (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-npm_and_yarn (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: nuget
   specs:
-    dependabot-nuget (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-nuget (0.281.0)
+      dependabot-common (= 0.281.0)
       rubyzip (>= 2.3.2, < 3.0)
 
 PATH
   remote: pub
   specs:
-    dependabot-pub (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-pub (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: python
   specs:
-    dependabot-python (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-python (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: silent
   specs:
-    dependabot-silent (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-silent (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: swift
   specs:
-    dependabot-swift (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-swift (0.281.0)
+      dependabot-common (= 0.281.0)
 
 PATH
   remote: terraform
   specs:
-    dependabot-terraform (0.280.0)
-      dependabot-common (= 0.280.0)
+    dependabot-terraform (0.281.0)
+      dependabot-common (= 0.281.0)
 
 GEM
   remote: https://rubygems.org/

bin/ci-test

@@ -10,17 +10,15 @@ function print_usage() {
 
 function handle_args() {
   export SUITE_NAME=$1
-  case $SUITE_NAME in
-    bundler1 | bundler2)
-      export MODULE=bundler
-      ;;
-    "")
-      print_usage
-      exit 1
-      ;;
-    *)
-      export MODULE=$SUITE_NAME
-  esac
+
+  # Only allow "bundler" as a valid SUITE_NAME
+  if [[ "$SUITE_NAME" != "bundler" ]]; then
+    echo "Error: Only 'bundler' is allowed as SUITE_NAME."
+    print_usage
+    exit 1
+  fi
+
+  export MODULE="bundler"
 
   if ! [ -d "$MODULE" ]; then
     print_usage

bundler/Dockerfile

@@ -3,8 +3,7 @@ FROM ghcr.io/dependabot/dependabot-updater-core
 USER dependabot
 
 COPY --chown=dependabot:dependabot bundler/helpers /opt/bundler/helpers
-RUN bash /opt/bundler/helpers/v1/build \
-  && bash /opt/bundler/helpers/v2/build
+RUN bash /opt/bundler/helpers/v2/build
 
 COPY --chown=dependabot:dependabot bundler $DEPENDABOT_HOME/bundler
 COPY --chown=dependabot:dependabot common $DEPENDABOT_HOME/common