Merge pull request #418 from msclock/renovate_vcpkg_baseline

Signed-off-by: l.feng <[email protected]>
serious-scaffold · Dec 11, 2024 · 20e1d81 · 20e1d81
2 parents 8ffcb54 + 6f750bd
commit 20e1d81
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/.renovaterc.json b/.renovaterc.json
@@ -69,16 +69,6 @@
         ]
       }
     },
-    {
-      "matchDepTypes": [
-        "vcpkg-baseline"
-      ],
-      "postUpgradeTasks": {
-        "commands": [
-          "find template -type f -name 'vcpkg.json.jinja' -exec sed -i 's|{{{currentDigest}}}|{{{newDigest}}}|g' {} +"
-        ]
-      }
-    },
     {
       "description": "Group renovate docker tag and pre-commit-hooks tag",
       "groupName": "renovate group",
@@ -121,7 +111,8 @@
       "depNameTemplate": "https://github.com/microsoft/vcpkg",
       "depTypeTemplate": "vcpkg-baseline",
       "fileMatch": [
-        "^vcpkg\\.json$"
+        "^vcpkg\\.json$",
+        "^template/vcpkg\\.json\\.jinja$"
       ],
       "matchStrings": [
         "\"builtin-baseline\": \"(?<currentDigest>.*?)\""
@@ -134,7 +125,8 @@
       "datasourceTemplate": "git-refs",
       "depTypeTemplate": "vcpkg-baseline",
       "fileMatch": [
-        "^vcpkg\\.json$"
+        "^vcpkg\\.json$",
+        "^template/vcpkg\\.json\\.jinja$"
       ],
       "matchStrings": [
         "\"baseline\": \"(?<currentDigest>.*?)\"[^}]+?\"repository\": \"(?<depName>.*?)\""

diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja
@@ -72,16 +72,6 @@
         ]
       }
     },
-    {
-      "matchDepTypes": [
-        "vcpkg-baseline"
-      ],
-      "postUpgradeTasks": {
-        "commands": [
-          "find template -type f -name 'vcpkg.json.jinja' -exec sed -i {{ '\'s|{{{currentDigest}}}|{{{newDigest}}}|g\'' }} {} +"
-        ]
-      }
-    },
 [%- endif %]
     {
       "description": "Group renovate docker tag and pre-commit-hooks tag",
@@ -132,6 +122,9 @@
       "depTypeTemplate": "vcpkg-baseline",
       "fileMatch": [
         "^vcpkg\\.json$"
+[%- if repo_name == 'ss-cpp' %],
+        "^template/vcpkg\\.json\\.jinja$"
+[%- endif %]
       ],
       "matchStrings": [
         "\"builtin-baseline\": \"(?<currentDigest>.*?)\""
@@ -145,6 +138,9 @@
       "depTypeTemplate": "vcpkg-baseline",
       "fileMatch": [
         "^vcpkg\\.json$"
+[%- if repo_name == 'ss-cpp' %],
+        "^template/vcpkg\\.json\\.jinja$"
+[%- endif %]
       ],
       "matchStrings": [
         "\"baseline\": \"(?<currentDigest>.*?)\"[^}]+?\"repository\": \"(?<depName>.*?)\""