From a0951ad8905393d6691786b0a84f312c68c444ea Mon Sep 17 00:00:00 2001 From: Brendan Fletcher Date: Wed, 10 Jan 2024 19:18:33 -0500 Subject: [PATCH] Update Qt version to 6.6.1 for all Qt6 builds --- .github/workflows/build.linux.workflow.yml | 2 +- .github/workflows/build.mac.workflow.yml | 2 +- .github/workflows/build.windows.workflow.yml | 2 +- gui/qt/vcpkg.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.linux.workflow.yml b/.github/workflows/build.linux.workflow.yml index 15ef5eb01..99f45e372 100644 --- a/.github/workflows/build.linux.workflow.yml +++ b/.github/workflows/build.linux.workflow.yml @@ -38,7 +38,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@43ec12788e42f375acfcb2cec059edfb9572fbaa # v3 with: - version: 6.4.2 + version: 6.6.1 target: desktop setup-python: false cache: true diff --git a/.github/workflows/build.mac.workflow.yml b/.github/workflows/build.mac.workflow.yml index a110a7fc9..078b9a88b 100644 --- a/.github/workflows/build.mac.workflow.yml +++ b/.github/workflows/build.mac.workflow.yml @@ -21,7 +21,7 @@ jobs: qtver: "5.15.2" qtvershort: 5 - os: macos-12 - qtver: "6.5.2" + qtver: "6.6.1" qtvershort: 6 steps: diff --git a/.github/workflows/build.windows.workflow.yml b/.github/workflows/build.windows.workflow.yml index d35c3b3c4..255eeb481 100644 --- a/.github/workflows/build.windows.workflow.yml +++ b/.github/workflows/build.windows.workflow.yml @@ -39,7 +39,7 @@ jobs: - name: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@3a22746930754ced94ac552915aa816265ef90c1 # latest as of 2023-08-30 with: - vcpkgGitCommitId: 'e21c414460498b0c7c94d815ad6d1a3d313ff28b' # latest as of 2023-08-30 + vcpkgGitCommitId: 'c9919121dde6f61c0436adda94624636e041226b' # latest as of 2024-01-10 - name: Build CEmu Qt ${{ matrix.config }} on Windows ${{ matrix.arch_name }} uses: lukka/run-cmake@fbcfe006bc5450def7a319af91733647d985d157 # latest as of 2023-08-30 diff --git a/gui/qt/vcpkg.json b/gui/qt/vcpkg.json index d2d1b645d..acad5b932 100644 --- a/gui/qt/vcpkg.json +++ b/gui/qt/vcpkg.json @@ -19,11 +19,11 @@ "features": [ "dbus", "gui", "network", "widgets", "png" ] } ], - "builtin-baseline": "e21c414460498b0c7c94d815ad6d1a3d313ff28b", + "builtin-baseline": "c9919121dde6f61c0436adda94624636e041226b", "overrides": [ { "name": "qtbase", - "version": "6.4.3" + "version": "6.6.1" } ] } \ No newline at end of file