Manage more parts of GHA with renovate

- Add custom rule for vcpkg - Add custom rule for repository checkouts Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
OpenVPN · Mar 13, 2024 · f8c7d06 · f8c7d06
1 parent 4a51628
commit f8c7d06
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -28,16 +28,18 @@ jobs:
         if: steps.check_submit.outputs.cache-hit != 'true'
         uses: actions/checkout@v3
         with:
+          # versioning=regex:^asio-(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)$
           repository: chriskohlhoff/asio
-          path: asio
           ref: asio-1-28-0
+          path: asio
       - name: Checkout xxHash
         if: steps.check_submit.outputs.cache-hit != 'true'
         uses: actions/checkout@v3
         with:
+          # versioning=semver-coerced
           repository: Cyan4973/xxHash
-          path: xxHash
           ref: v0.8.2
+          path: xxHash
       - uses: lukka/get-cmake@v3.28.3
         if: steps.check_submit.outputs.cache-hit != 'true'
 

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Restore from cache and install vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: '8b04a7bd93bef991818fc372bb83ce00ec1c1c16'
+        vcpkgGitCommitId: 8b04a7bd93bef991818fc372bb83ce00ec1c1c16
         vcpkgJsonGlob: '**/windows/vcpkg.json'
 
     - name: Run CMake with vcpkg.json manifest
@@ -70,7 +70,7 @@ jobs:
     - name: Restore from cache and install vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: '8b04a7bd93bef991818fc372bb83ce00ec1c1c16'
+        vcpkgGitCommitId: 8b04a7bd93bef991818fc372bb83ce00ec1c1c16
         vcpkgJsonGlob: '**/mingw/vcpkg.json'
 
     - name: Run CMake with vcpkg.json manifest

diff --git a/renovate.json b/renovate.json
@@ -13,17 +13,38 @@
             "extends": [
                 "schedule:monthly"
             ]
+        },
+        {
+            "matchDepNames": [
+                "vcpkg"
+            ],
+            "extends": [
+                "schedule:monthly"
+            ]
         }
     ],
     "customManagers": [
         {
             "customType": "regex",
-            "fileMatch": [
-                "\\.cmake$"
-            ],
+            "fileMatch": ["\\.cmake$"],
             "matchStrings": [
                 "datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s*set\\(.*_VERSION\\s*(?<currentValue>.*?)\\)\\s"
             ]
+        },
+        {
+            "customType": "regex",
+            "fileMatch": ["^\\.github/workflows/.+\\.yml$"],
+            "matchStrings": ["vcpkgGitCommitId:\\s*(?<currentDigest>.*?)\\n"],
+            "currentValueTemplate": "master",
+            "depNameTemplate": "vcpkg",
+            "packageNameTemplate": "https://github.com/microsoft/vcpkg",
+            "datasourceTemplate": "git-refs"
+        },
+        {
+            "customType": "regex",
+            "fileMatch": ["^\\.github/workflows/.+\\.yml$"],
+            "matchStrings": ["versioning=(?<versioning>.*?)\\n\\s*repository:\\s*(?<depName>.*?)\\n\\s*ref:\\s*(?<currentValue>.*?)\\n"],
+            "datasourceTemplate": "github-tags"
         }
     ]
 }