Skip to content

Commit 184b2b4

Browse files
authored
Merge pull request #2070 from travis-ci/gitsubup-quiet-qa
Quiet cloning the submodules
2 parents ab16794 + fcfd661 commit 184b2b4

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

lib/travis/vcs/git/submodules.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def apply
88
sh.if '-f .gitmodules' do
99
sh.fold 'git.submodule' do
1010
sh.file '~/.ssh/config', "Host github.com\n\tStrictHostKeyChecking no\n", append: true
11-
sh.cmd "git submodule update --init --recursive #{update_args}".strip, assert: true, retry: true
11+
sh.cmd "git submodule update --init --recursive --quiet #{update_args}".strip, assert: true, retry: true
1212
end
1313
end
1414
end

public/version-aliases/ghc.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@
166166
"9.0.1-alpha1": "9.0.1-alpha1",
167167
"9.0": "9.0.2",
168168
"9.0.1": "9.0.1",
169-
"9": "9.6.0.20230210",
170-
"9.x": "9.6.0.20230210",
171-
"9.x.x": "9.6.0.20230210",
169+
"9": "9.6.0.20230302",
170+
"9.x": "9.6.0.20230302",
171+
"9.x.x": "9.6.0.20230302",
172172
"9.0.x": "9.0.2",
173173
"9.0.2": "9.0.2",
174174
"9.2.1-alpha1": "9.2.1-alpha1",
@@ -192,10 +192,11 @@
192192
"9.4.3": "9.4.3",
193193
"9.4.4": "9.4.4",
194194
"9.6.0.20230111": "9.6.0.20230111",
195-
"9.6.x": "9.6.0.20230210",
195+
"9.6.x": "9.6.0.20230302",
196196
"9.6": "9.6.1-alpha3",
197197
"9.6.0.20230128": "9.6.0.20230128",
198198
"9.6.0.20230210": "9.6.0.20230210",
199+
"9.6.0.20230302": "9.6.0.20230302",
199200
"9.6.1-alpha1": "9.6.1-alpha1",
200201
"9.6.1-alpha2": "9.6.1-alpha2",
201202
"9.6.1-alpha3": "9.6.1-alpha3"

spec/build/git/submodules_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
let(:sexp) { sexp_find(subject, [:if, '-f .gitmodules'], [:then]) }
99

1010
let(:no_host_key_check) { [:file, ['~/.ssh/config', "Host github.com\n\tStrictHostKeyChecking no\n"], append: true] }
11-
let(:submodule_update) { [:cmd, 'git submodule update --init --recursive', assert: true, echo: true, retry: true, timing: true] }
11+
let(:submodule_update) { [:cmd, 'git submodule update --init --recursive --quiet', assert: true, echo: true, retry: true, timing: true] }
1212

1313
describe 'if .gitmodules exists' do
1414
it { should include_sexp no_host_key_check }
@@ -19,7 +19,7 @@
1919

2020
describe 'if :submodules_depth is given' do
2121
before { payload[:config][:git] = { submodules_depth: 50 } }
22-
it { should include_sexp [:cmd, 'git submodule update --init --recursive --depth=50', assert: true, echo: true, retry: true, timing: true] }
22+
it { should include_sexp [:cmd, 'git submodule update --init --recursive --quiet --depth=50', assert: true, echo: true, retry: true, timing: true] }
2323
end
2424
end
2525

0 commit comments

Comments
 (0)