From 73661665a99e9bd4abc9eb106e2e789d876e5026 Mon Sep 17 00:00:00 2001 From: Eric Amorde Date: Sun, 15 Oct 2023 14:17:30 -0700 Subject: [PATCH 1/2] Update specs to run on macOS 12 --- .github/workflows/Specs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Specs.yml b/.github/workflows/Specs.yml index d4dbb89..e3e7862 100644 --- a/.github/workflows/Specs.yml +++ b/.github/workflows/Specs.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15] + os: [macos-12] ruby: [2.7, 3.0.0] name: ${{ matrix.os }} / Ruby ${{ matrix.ruby }} From e84cb5e4614d442a95ca8cab5d67a23124a9ed76 Mon Sep 17 00:00:00 2001 From: Eric Amorde Date: Sun, 15 Oct 2023 15:11:44 -0700 Subject: [PATCH 2/2] Explicitly enable file protocol in submodule test --- spec/git_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/git_spec.rb b/spec/git_spec.rb index d93ded5..5cb96df 100644 --- a/spec/git_spec.rb +++ b/spec/git_spec.rb @@ -71,6 +71,13 @@ def fixture_url(name) FileUtils.cp_r(fixture('git-submodule-repo'), '/tmp/') options = { :git => fixture('git-repo'), :commit => 'd7f4104', :submodules => true } downloader = Downloader.for_target(tmp_folder, options) + downloader.instance_exec do + # Explicitly allow file transport as newer Git versions + # disable it by default + def target_git(*args) + super('-c', 'protocol.file.allow=always', *args) + end + end downloader.download tmp_folder('README').read.strip.should == 'added submodule' tmp_folder('submodule/README').read.strip.should == 'submodule'