File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed
src/bootstrap/src/core/build_steps Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -3129,7 +3129,7 @@ impl Step for Distcheck {
31293129
31303130 let configure_args: Vec < String > = std:: env:: var ( "DISTCHECK_CONFIGURE_ARGS" )
31313131 . map ( |args| args. split ( " " ) . map ( |s| s. to_string ( ) ) . collect :: < Vec < String > > ( ) )
3132- . unwrap_or ( vec ! [ ] ) ;
3132+ . unwrap_or_default ( ) ;
31333133
31343134 command ( "tar" )
31353135 . arg ( "-xf" )
@@ -3146,6 +3146,9 @@ impl Step for Distcheck {
31463146 . run ( builder) ;
31473147 command ( helpers:: make ( & builder. config . host_target . triple ) )
31483148 . arg ( "check" )
3149+ // Do not run the build as if we were in CI, otherwise git would be assumed to be
3150+ // present, but we build from a tarball here
3151+ . env ( "GITHUB_ACTIONS" , "0" )
31493152 . current_dir ( & plain_src_dir)
31503153 . run ( builder) ;
31513154
You can’t perform that action at this time.
0 commit comments