feat(): patch renovate post execution mode

easyops-cn · Feb 4, 2024 · 8eef82c · 8eef82c
1 parent 5ebc9d8
commit 8eef82c
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 14 deletions.
diff --git a/packages/create-next-repo/src/patches/patchInternalRenovate.spec.ts b/packages/create-next-repo/src/patches/patchInternalRenovate.spec.ts
@@ -18,19 +18,23 @@ describe("patchInternalRenovate", () => {
     mockFsReadJsonSync.mockReturnValueOnce({
       packageRules: [
         {
-          matchDepTypes: ["devDependencies"],
-          matchUpdateTypes: ["minor", "patch"],
-          automerge: true,
+          excludePackagePatterns: ["^@next-core/", "^@next-libs/"],
+          enabled: false,
         },
         {
-          groupName: "next-core packages",
           matchPackagePatterns: ["^@next-core/"],
-          automerge: false,
+          matchUpdateTypes: ["major"],
+          enabled: false,
         },
         {
+          groupName: "next-core packages",
           matchPackagePatterns: ["^@next-core/"],
-          matchUpdateTypes: ["major"],
-          enabled: false,
+          matchUpdateTypes: ["minor", "patch"],
+        },
+        {
+          groupName: "next-libs packages",
+          matchPackagePatterns: ["^@next-libs/"],
+          separateMajorMinor: false,
         },
       ],
     });
@@ -49,14 +53,18 @@ describe("patchInternalRenovate", () => {
       {
         packageRules: [
           {
-            matchDepTypes: ["devDependencies"],
-            matchUpdateTypes: ["minor", "patch"],
-            automerge: true,
+            excludePackagePatterns: ["^@next-core/", "^@next-libs/"],
+            enabled: false,
+          },
+          {
+            matchPackagePatterns: ["^@next-core/"],
+            matchUpdateTypes: ["major"],
+            enabled: false,
           },
           {
             groupName: "next-core packages",
             matchPackagePatterns: ["^@next-core/"],
-            automerge: false,
+            matchUpdateTypes: ["minor", "patch"],
             postUpgradeTasks: {
               commands: [
                 "yarn renew",
@@ -65,6 +73,7 @@ describe("patchInternalRenovate", () => {
                 "yarn-deduplicate yarn.lock",
                 "yarn",
               ],
+              executionMode: "branch",
               fileFilters: [
                 "**/*",
                 ".gitignore",
@@ -76,9 +85,9 @@ describe("patchInternalRenovate", () => {
             },
           },
           {
-            matchPackagePatterns: ["^@next-core/"],
-            matchUpdateTypes: ["major"],
-            enabled: false,
+            groupName: "next-libs packages",
+            matchPackagePatterns: ["^@next-libs/"],
+            separateMajorMinor: false,
           },
         ],
       },

diff --git a/packages/create-next-repo/src/patches/patchInternalRenovate.ts b/packages/create-next-repo/src/patches/patchInternalRenovate.ts
@@ -25,6 +25,7 @@ export function patchInternalRenovate(dest: string): Promise<void> {
         "yarn-deduplicate yarn.lock",
         "yarn",
       ],
+      executionMode: "branch",
       fileFilters: [
         "**/*",
         ".gitignore",

diff --git a/packages/dev-dependencies/patch.js b/packages/dev-dependencies/patch.js
@@ -29,6 +29,7 @@ const {
   onlyAutoMergePatchVersions,
   enableLernaWithNx,
   updateRenovateForV2,
+  updateRenovatePostExecutionMode,
 } = require("./patches");
 
 function initAndGetDevDependenciesVersion() {
@@ -204,6 +205,10 @@ module.exports = async function patch() {
     updateRenovateForV2();
   }
 
+  if (semver.lt(currentRenewVersion, "1.18.0")) {
+    updateRenovatePostExecutionMode();
+  }
+
   updateDevDependenciesVersion();
 };
 

diff --git a/packages/dev-dependencies/patches/index.js b/packages/dev-dependencies/patches/index.js
@@ -22,3 +22,4 @@ exports.migrateLazyBricksWithJest = require("./migrateLazyBricksWithJest");
 exports.onlyAutoMergePatchVersions = require("./onlyAutoMergePatchVersions");
 exports.enableLernaWithNx = require("./enableLernaWithNx");
 exports.updateRenovateForV2 = require("./updateRenovateForV2");
+exports.updateRenovatePostExecutionMode = require("./updateRenovatePostExecutionMode");
diff --git a/packages/dev-dependencies/patches/updateRenovateForV2.js b/packages/dev-dependencies/patches/updateRenovateForV2.js
@@ -31,6 +31,7 @@ function updateRenovateForV2() {
                 "yarn-deduplicate yarn.lock",
                 "yarn",
               ],
+              executionMode: "branch",
               fileFilters: [
                 "**/*",
                 ".gitignore",

diff --git a/packages/dev-dependencies/patches/updateRenovateForV2.spec.js b/packages/dev-dependencies/patches/updateRenovateForV2.spec.js
@@ -80,6 +80,7 @@ describe("updateRenovateForV2", () => {
                 "yarn-deduplicate yarn.lock",
                 "yarn",
               ],
+              executionMode: "branch",
               fileFilters: [
                 "**/*",
                 ".gitignore",

diff --git a/packages/dev-dependencies/patches/updateRenovatePostExecutionMode.js b/packages/dev-dependencies/patches/updateRenovatePostExecutionMode.js
@@ -0,0 +1,17 @@
+const path = require("path");
+const { readJson, writeJsonFile } = require("../utils");
+
+function updateRenovatePostExecutionMode() {
+  const renovateJsonPath = path.resolve("renovate.json");
+  const renovateJson = readJson(renovateJsonPath);
+
+  if (
+    renovateJson.postUpgradeTasks &&
+    renovateJson.postUpgradeTasks.executionMode !== "branch"
+  ) {
+    renovateJson.postUpgradeTasks.executionMode = "branch";
+    writeJsonFile(renovateJsonPath, renovateJson);
+  }
+}
+
+module.exports = updateRenovatePostExecutionMode;
diff --git a/packages/dev-dependencies/patches/updateRenovatePostExecutionMode.spec.js b/packages/dev-dependencies/patches/updateRenovatePostExecutionMode.spec.js
@@ -0,0 +1,40 @@
+const updateRenovatePostExecutionMode = require("./updateRenovatePostExecutionMode");
+const { writeJsonFile, readJson } = require("../utils");
+
+jest.mock("../utils");
+
+describe("updateRenovatePostExecutionMode", () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should ignore if no postUpgradeTasks", () => {
+    readJson.mockReturnValueOnce({
+      packageRules: [
+        {
+          groupName: "next-core packages",
+        },
+      ],
+    });
+    updateRenovatePostExecutionMode();
+    expect(writeJsonFile).not.toBeCalled();
+  });
+
+  it("should update fileFilters", () => {
+    readJson.mockReturnValueOnce({
+      postUpgradeTasks: {
+        commands: ["yarn renew"],
+      },
+    });
+    updateRenovatePostExecutionMode();
+    expect(writeJsonFile).toBeCalledWith(
+      expect.stringContaining("renovate.json"),
+      {
+        postUpgradeTasks: {
+          commands: ["yarn renew"],
+          executionMode: "branch",
+        },
+      }
+    );
+  });
+});