From bdc970d7187020abae6426ce97f943e4a24a0ea2 Mon Sep 17 00:00:00 2001 From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com> Date: Thu, 18 Jan 2024 03:22:39 -0800 Subject: [PATCH] Chore: Fixes #9710: Default plugins build: Fetch when checkout fails (#9711) Co-authored-by: Laurent Cozic --- packages/default-plugins/buildDefaultPlugins.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/default-plugins/buildDefaultPlugins.ts b/packages/default-plugins/buildDefaultPlugins.ts index f1ac707c4a..e1e04bf541 100644 --- a/packages/default-plugins/buildDefaultPlugins.ts +++ b/packages/default-plugins/buildDefaultPlugins.ts @@ -47,7 +47,14 @@ const buildDefaultPlugins = async (outputParentDir: string|null, beforeInstall: if (currentCommitHash !== expectedCommitHash) { logStatus(`Switching to commit ${expectedCommitHash}`); await execCommand(['git', 'switch', repositoryData.branch]); - await execCommand(['git', 'checkout', expectedCommitHash]); + + try { + await execCommand(['git', 'checkout', expectedCommitHash]); + } catch (error) { + logStatus(`git checkout failed with error ${error}. Fetching...`); + await execCommand(['git', 'fetch']); + await execCommand(['git', 'checkout', expectedCommitHash]); + } } logStatus('Copying repository files...');