fix: Fixing remote add to succeed even when remote already added (#116)

Co-authored-by: wchomik <[email protected]>

Author: wchomik

typescript/packages/helm-chart/version-bump/dist/index.js

@@ -69370,7 +69370,16 @@ async function run() {
             else {
                 console.log('Token not found, using unauthenticated repo URL: ' + authenticatedRepoUrl);
             }
-            await utilsHelmChart.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE });
+            // Check if upstream remote already exists
+            const remotesResult = await utilsHelmChart.exec('git remote', [], { cwd: GITHUB_WORKSPACE });
+            const existingRemotes = remotesResult.stdout.split('\n').map(remote => remote.trim());
+            if (!existingRemotes.includes('upstream')) {
+                await utilsHelmChart.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE });
+                console.log('Added upstream remote');
+            }
+            else {
+                console.log('Upstream remote already exists');
+            }
             await utilsHelmChart.exec('git remote -v', [], { cwd: GITHUB_WORKSPACE });
             await utilsHelmChart.exec('git fetch --all', [], { cwd: GITHUB_WORKSPACE });
             result = await utilsHelmChart.exec('git diff --name-only "upstream/' + BASE_BRANCH_NAME + '..origin/' + BRANCH_NAME + '"', [], { cwd: GITHUB_WORKSPACE });

typescript/packages/helm-chart/version-bump/dist/index.js.map

@@ -63,7 +63,17 @@ export async function run(): Promise<void> {
         console.log('Token not found, using unauthenticated repo URL: ' + authenticatedRepoUrl)
       }
 
-      await utilsHelmChart.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE })
+      // Check if upstream remote already exists
+      const remotesResult = await utilsHelmChart.exec('git remote', [], { cwd: GITHUB_WORKSPACE })
+      const existingRemotes = remotesResult.stdout.split('\n').map(remote => remote.trim())
+
+      if (!existingRemotes.includes('upstream')) {
+        await utilsHelmChart.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE })
+        console.log('Added upstream remote')
+      } else {
+        console.log('Upstream remote already exists')
+      }
+
       await utilsHelmChart.exec('git remote -v', [], { cwd: GITHUB_WORKSPACE })
       await utilsHelmChart.exec('git fetch --all', [], { cwd: GITHUB_WORKSPACE })
       result = await utilsHelmChart.exec('git diff --name-only "upstream/' + BASE_BRANCH_NAME + '..origin/' + BRANCH_NAME + '"', [], { cwd: GITHUB_WORKSPACE })

typescript/packages/helm-chart/version-bump/dist/main.d.ts.map

@@ -69360,7 +69360,16 @@ async function run() {
             else {
                 console.log('Token not found, using unauthenticated repo URL: ' + authenticatedRepoUrl);
             }
-            await utilsKustomize.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE });
+            // Check if upstream remote already exists
+            const remotesResult = await utilsKustomize.exec('git remote', [], { cwd: GITHUB_WORKSPACE });
+            const existingRemotes = remotesResult.stdout.split('\n').map(remote => remote.trim());
+            if (!existingRemotes.includes('upstream')) {
+                await utilsKustomize.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE });
+                console.log('Added upstream remote');
+            }
+            else {
+                console.log('Upstream remote already exists');
+            }
             await utilsKustomize.exec('git remote -v', [], { cwd: GITHUB_WORKSPACE });
             await utilsKustomize.exec('git fetch --all', [], { cwd: GITHUB_WORKSPACE });
         }

typescript/packages/helm-chart/version-bump/src/main.ts

@@ -55,7 +55,17 @@ export async function run(): Promise<void> {
         console.log('Token not found, using unauthenticated repo URL: ' + authenticatedRepoUrl)
       }
 
-      await utilsKustomize.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE })
+      // Check if upstream remote already exists
+      const remotesResult = await utilsKustomize.exec('git remote', [], { cwd: GITHUB_WORKSPACE })
+      const existingRemotes = remotesResult.stdout.split('\n').map(remote => remote.trim())
+
+      if (!existingRemotes.includes('upstream')) {
+        await utilsKustomize.exec('git remote add upstream ' + authenticatedRepoUrl, [], { cwd: GITHUB_WORKSPACE })
+        console.log('Added upstream remote')
+      } else {
+        console.log('Upstream remote already exists')
+      }
+
       await utilsKustomize.exec('git remote -v', [], { cwd: GITHUB_WORKSPACE })
       await utilsKustomize.exec('git fetch --all', [], { cwd: GITHUB_WORKSPACE })
     }