@@ -551,6 +551,8 @@ public function run()
551
551
throw new \InvalidArgumentException ('Invalid composer.json file ' );
552
552
}
553
553
$ config = $ this ->ensureFreshConfig ($ composer_json_data );
554
+ $ this ->doComposerInstall ($ config );
555
+ $ config = $ this ->ensureFreshConfig ($ composer_json_data );
554
556
$ this ->client = $ this ->getClient ($ this ->slug );
555
557
$ this ->privateClient = $ this ->getClient ($ this ->slug );
556
558
$ this ->privateClient ->authenticate ($ this ->userToken , null );
@@ -592,11 +594,12 @@ public function run()
592
594
$ this ->log ($ this ->getLastStdErr ());
593
595
throw new \Exception ('There was an error trying to switch to default branch ' );
594
596
}
595
- // Re-read the composer.json file, since it can be different on the default branch,
597
+ // Re-read the composer.json file, since it can be different on the default branch.
598
+ $ this ->doComposerInstall ($ config );
596
599
$ composer_json_data = $ this ->composerGetter ->getComposerJsonData ();
600
+ $ config = $ this ->ensureFreshConfig ($ composer_json_data );
597
601
$ this ->runAuthExport ($ hostname );
598
602
$ this ->handleDrupalContribSa ($ composer_json_data );
599
- $ config = $ this ->ensureFreshConfig ($ composer_json_data );
600
603
$ this ->handleTimeIntervalSetting ($ config );
601
604
$ lock_file = $ this ->composerJsonDir . '/composer.lock ' ;
602
605
$ initial_composer_lock_data = false ;
0 commit comments