Merge pull request #3749 from rubygems/clone_from_local

Clone from local
rubygems · Jun 23, 2020 · 83dc347 · 83dc347
2 parents 03713f8 + 9c30463
commit 83dc347
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ubuntu-bundler.yml b/.github/workflows/ubuntu-bundler.yml
@@ -29,12 +29,14 @@ jobs:
       RGV: ${{ matrix.rgv }}
       RUBYOPT: --disable-gems
     steps:
-      - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
-          path: bundler/tmp/rubygems
-          ref: ${{ matrix.rgv }}
+          fetch-depth: 0
         if: matrix.rgv != '..'
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+        if: matrix.rgv == '..'
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml
@@ -17,12 +17,14 @@ jobs:
     env:
       RGV: ${{ matrix.rgv }}
     steps:
-      - uses: actions/checkout@v2
       - uses: actions/checkout@v2
         with:
-          path: bundler/tmp/rubygems
-          ref: ${{ matrix.rgv }}
+          fetch-depth: 0
         if: matrix.rgv != '..'
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+        if: matrix.rgv == '..'
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/bundler/spec/support/rubygems_version_manager.rb b/bundler/spec/support/rubygems_version_manager.rb
@@ -75,7 +75,6 @@ def reexec_if_needed
   def switch_local_copy_if_needed
     return unless local_copy_switch_needed?
 
-    sys_exec("git remote update", :dir => local_copy_path)
     sys_exec("git checkout #{target_tag}", :dir => local_copy_path)
 
     ENV["RGV"] = local_copy_path.to_s
@@ -107,8 +106,7 @@ def resolve_local_copy_path
     rubygems_path = source_root.join("tmp/rubygems")
 
     unless rubygems_path.directory?
-      rubygems_path.parent.mkpath
-      sys_exec("git clone https://github.com/rubygems/rubygems.git #{rubygems_path}")
+      sys_exec("git clone .. #{rubygems_path}", :dir => source_root)
     end
 
     rubygems_path