From 8dd59cf3cf21e026e28b338a4c4fd0b620e1c7bb Mon Sep 17 00:00:00 2001 From: tooomm Date: Wed, 9 Aug 2023 12:28:16 +0200 Subject: [PATCH] CI: Bump GitHub actions + submodule (#4852) * Bump used actions * Update vcpkg submodule (#4857) * Pause npm updates for webclient (#4853) * Bump peter-evans/create-pull-request from 4 to 5 (#4846) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update vcpkg --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump vcpkg action to v11 * Update vcpkg cache setting --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/desktop-build.yml | 6 +++--- vcpkg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 5ccf2462f..ad3f036a0 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -336,7 +336,7 @@ jobs: steps: - name: Add msbuild to PATH id: add-msbuild - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v1 - name: Checkout uses: actions/checkout@v3 @@ -354,10 +354,10 @@ jobs: modules: ${{matrix.qt_modules}} - name: Run vcpkg - uses: lukka/run-vcpkg@v10.6 + uses: lukka/run-vcpkg@v11 with: runVcpkgInstall: true - appendedCacheKey: ${{matrix.bit}}-bit + doNotCache: false env: VCPKG_DEFAULT_TRIPLET: '${{matrix.arch}}-windows' VCPKG_DISABLE_METRICS: 1 diff --git a/vcpkg b/vcpkg index c30de8e13..247662ef3 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit c30de8e1369e03f4a569f8f224eed418dd0949bb +Subproject commit 247662ef304453c72acd6b520fa7ff7656e7347c