Merge pull request open-telemetry#119 from MSNev/MSNev/FixMergeScript

chore: Fix auto merge script from repo-staging branch to main
opentelemetrybot · Jun 6, 2023 · be520d3 · be520d3
2 parents 7d94d1e + 83993b2
commit be520d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/sandbox-tools/merge-repos/src/config.ts b/sandbox-tools/merge-repos/src/config.ts
@@ -194,7 +194,8 @@ export let addMissingDevDeps = {
  * Remove these dependencies (required or dev)
  */
 export let dropDependencies = {
-    "lerna": ""
+    "lerna": true,
+    "rimraf": true
 };
 
 /**

diff --git a/sandbox-tools/merge-repos/src/mergeStagingToMain.ts b/sandbox-tools/merge-repos/src/mergeStagingToMain.ts
@@ -500,7 +500,7 @@ function shouldProcess(inputFile) {
     return inputFile.indexOf("/src/") !== -1 || inputFile.indexOf("/test/") !== -1;
 }
 
-function isDropPackage(name) {
+function isDropPackage(name: string) {
     if (dropDependencies[name]) {
         return true;
     }
@@ -560,10 +560,12 @@ function updateDependencies(srcPackage: IPackageJson, destPackage: IPackageJson,
                     }
                 }
             } else {
-                if (destDeps[destKey] && dropDependencies[destKey]) {
-                    delete destDeps[destKey];
+                if (destDeps[key] && dropDependencies[key]) {
+                    delete destDeps[key];
                     log(`    -- ${key} -- dropped`);
                     changed = true;
+                } else {
+                    logWarn(`    -- ${key} -- NOT dropped (dest:${!!destDeps[key]}) (drop:${!!dropDependencies[key]})`);
                 }
             }
         });