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 {
3129
3129
3130
3130
let configure_args: Vec < String > = std:: env:: var ( "DISTCHECK_CONFIGURE_ARGS" )
3131
3131
. map ( |args| args. split ( " " ) . map ( |s| s. to_string ( ) ) . collect :: < Vec < String > > ( ) )
3132
- . unwrap_or ( vec ! [ ] ) ;
3132
+ . unwrap_or_default ( ) ;
3133
3133
3134
3134
command ( "tar" )
3135
3135
. arg ( "-xf" )
@@ -3146,6 +3146,9 @@ impl Step for Distcheck {
3146
3146
. run ( builder) ;
3147
3147
command ( helpers:: make ( & builder. config . host_target . triple ) )
3148
3148
. 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" )
3149
3152
. current_dir ( & plain_src_dir)
3150
3153
. run ( builder) ;
3151
3154
You can’t perform that action at this time.
0 commit comments