diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 6861813ce..00a2617e6 100644 --- 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-(?\d+)-(?\d+)-(?\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 index a912078ac..d914b5b19 100644 --- 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 index fffc56a37..a76986e9b 100644 --- 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=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\s*set\\(.*_VERSION\\s*(?.*?)\\)\\s" ] + }, + { + "customType": "regex", + "fileMatch": ["^\\.github/workflows/.+\\.yml$"], + "matchStrings": ["vcpkgGitCommitId:\\s*(?.*?)\\n"], + "currentValueTemplate": "master", + "depNameTemplate": "vcpkg", + "packageNameTemplate": "https://github.com/microsoft/vcpkg", + "datasourceTemplate": "git-refs" + }, + { + "customType": "regex", + "fileMatch": ["^\\.github/workflows/.+\\.yml$"], + "matchStrings": ["versioning=(?.*?)\\n\\s*repository:\\s*(?.*?)\\n\\s*ref:\\s*(?.*?)\\n"], + "datasourceTemplate": "github-tags" } ] }