revert postUpdateOptions related options

renovatebot · Aug 31, 2021 · 148a792 · 148a792
1 parent de38a32
commit 148a792
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/lib/config/types.ts b/lib/config/types.ts
@@ -44,7 +44,6 @@ export interface RenovateSharedConfig {
   hashedBranchLength?: number;
   npmrc?: string;
   platform?: string;
-  postUpdateOptions?: string[];
   postUpgradeTasks?: PostUpgradeTasks;
   prBodyColumns?: string[];
   prBodyDefinitions?: Record<string, string>;
@@ -187,6 +186,7 @@ export interface RenovateConfig
   dependencyDashboardLabels?: string[];
   packageFile?: string;
   packageRules?: PackageRule[];
+  postUpdateOptions?: string[];
   prConcurrentLimit?: number;
   prHourlyLimit?: number;
 

diff --git a/lib/workers/branch/reuse.spec.ts b/lib/workers/branch/reuse.spec.ts
@@ -88,17 +88,6 @@ describe('workers/branch/reuse', () => {
       expect(res.reuseExistingBranch).toBe(true);
     });
 
-    it('returns false if does not need rebasing but has postUpdateOptions', async () => {
-      config.postUpdateOptions = ['yarnDedupeFewer'];
-      git.branchExists.mockReturnValueOnce(true);
-      platform.getBranchPr.mockResolvedValueOnce({
-        ...pr,
-        isConflicted: false,
-      });
-      const res = await shouldReuseExistingBranch(config);
-      expect(res.reuseExistingBranch).toBe(false);
-    });
-
     it('returns true if unmergeable and cannot rebase', async () => {
       git.branchExists.mockReturnValueOnce(true);
       platform.getBranchPr.mockResolvedValueOnce({

diff --git a/lib/workers/branch/reuse.ts b/lib/workers/branch/reuse.ts
@@ -1,17 +1,17 @@
 import { getGlobalConfig } from '../../config/global';
+import type { RenovateConfig } from '../../config/types';
 import { logger } from '../../logger';
 import { platform } from '../../platform';
 import type { RangeStrategy } from '../../types';
 import { branchExists, isBranchModified, isBranchStale } from '../../util/git';
-import type { BranchConfig } from '../types';
 
 type ParentBranch = {
   reuseExistingBranch: boolean;
   isModified?: boolean;
 };
 
 export async function shouldReuseExistingBranch(
-  config: BranchConfig
+  config: RenovateConfig
 ): Promise<ParentBranch> {
   const { branchName } = config;
   // Check if branch exists
@@ -113,19 +113,5 @@ export async function shouldReuseExistingBranch(
     }
   }
 
-  // Branches can get in an inconsistent state if postUpdateOptions is used.
-  // package.json updates are run conditionally, but postUpdateOptions are run everytime
-  // On the first execution, everything is executed, but if on a second execution the package.json modification is
-  // skipped but the postUpdateOptions is executed, the lockfile will have a different result than if it was executed
-  // along with the changes to the package.json. Thus ending up with an incomplete branch update
-  // This is why we are skipping branch reuse when postUpdateOptions is used (#10050)
-  if (config.postUpdateOptions?.length > 0) {
-    logger.debug(`Branch is using postUpdateOptions`);
-    return {
-      reuseExistingBranch: false,
-      isModified: false,
-    };
-  }
-
   return { reuseExistingBranch: true, isModified: false };
 }