From f52437f7b3fd974229cbccf579126b6b5caa8761 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:07:03 +0800 Subject: [PATCH 1/6] update Qt to 6.10.1 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 060c9ad..8566e50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,25 +94,25 @@ jobs: matrix: include: - platform: windows-latest - qt_version: "6.10.0" + qt_version: "6.10.1" target: x86_64 - platform: windows-11-arm - qt_version: "6.10.0" + qt_version: "6.10.1" target: arm64 - platform: ubuntu-22.04 - qt_version: "6.10.0" + qt_version: "6.10.1" target: amd64 - platform: ubuntu-22.04 qt_version: "6.2.0" target: amd64 - platform: ubuntu-24.04-arm - qt_version: "6.10.0" + qt_version: "6.10.1" target: arm64 - platform: macos-latest - qt_version: "6.10.0" + qt_version: "6.10.1" target: x86_64 - platform: macos-latest - qt_version: "6.10.0" + qt_version: "6.10.1" target: arm64 - platform: macos-latest qt_version: "6.4.3" From 722cc72cad58a2770e4ae2b2816da21d181f1620 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:42:28 +0800 Subject: [PATCH 2/6] Revert "Fix openssl cache again" This reverts commit 8edf60fa9b8011695288d48b6fdf05bed1981456. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8566e50..8f06a69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: if: matrix.platform == 'windows-latest' && matrix.qt_version != '6.2.12' uses: actions/cache@v4.2.3 with: - path: C:/vcpkg/installed/x64-mingw-static + path: ${{ env.VCPKG_INSTALLATION_ROOT }}/installed/x64-mingw-static key: OpenSSLCache-${{ matrix.platform }}-${{ matrix.target }} - name: Install OpenSSL (Windows) if: matrix.platform == 'windows-latest' && steps.cache-openssl.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' @@ -189,8 +189,8 @@ jobs: mkdir build cd build curl -fLso srslist.h "https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/srslist.h" - cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DOPENSSL_ROOT_DIR="$VCPKG_INSTALLATION_ROOT/installed/x64-mingw-static" -DCMAKE_BUILD_TYPE=Debug .. - ninja + cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DOPENSSL_ROOT_DIR="$VCPKG_ROOT/installed/x64-mingw-static" -DCMAKE_BUILD_TYPE=Debug .. + ninja -j2 cd .. ./script/deploy_windows.sh - name: Legacy Windows - Generate MakeFile and Build From 747235d2b53eadd20695303cca0f343e6402e21c Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:42:40 +0800 Subject: [PATCH 3/6] Revert "Fix openssl cache" This reverts commit 1fac0e3465827598c9067c49c429d14579ac0721. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f06a69..69b9c5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: if: matrix.platform == 'windows-latest' && matrix.qt_version != '6.2.12' uses: actions/cache@v4.2.3 with: - path: ${{ env.VCPKG_INSTALLATION_ROOT }}/installed/x64-mingw-static + path: ${{ env.VCPKG_ROOT }}/installed/x64-mingw-static key: OpenSSLCache-${{ matrix.platform }}-${{ matrix.target }} - name: Install OpenSSL (Windows) if: matrix.platform == 'windows-latest' && steps.cache-openssl.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' From 896e81bcb8b65bd39bb864b764eef835060f595a Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:42:46 +0800 Subject: [PATCH 4/6] Revert "Fix openSSL install" This reverts commit 039f16e4d4cd2b1b88f0eb73f5000b1166523567. --- .github/workflows/build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69b9c5f..9fb0bbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -155,15 +155,8 @@ jobs: with: path: qt6/build key: QtStaticCache-${{ matrix.platform }}-${{ matrix.target }}-Qt${{ matrix.qt_version }}-${{ hashFiles('script/build_qt_static_windows.bat') }} - - name: OpenSSL Cache - id: cache-openssl - if: matrix.platform == 'windows-latest' && matrix.qt_version != '6.2.12' - uses: actions/cache@v4.2.3 - with: - path: ${{ env.VCPKG_ROOT }}/installed/x64-mingw-static - key: OpenSSLCache-${{ matrix.platform }}-${{ matrix.target }} - name: Install OpenSSL (Windows) - if: matrix.platform == 'windows-latest' && steps.cache-openssl.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' + if: matrix.platform == 'windows-latest' && steps.cache-static-Qt.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' shell: powershell run: | echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append From 1a59260de74747f3a38bb6ecb8df9643ccb05182 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:42:49 +0800 Subject: [PATCH 5/6] Revert "try building qt with openssl for windows" This reverts commit ca895dfefe3e3d4b057cd50401ebd470acfbb9c2. --- .github/workflows/build.yml | 10 ++-------- script/build_qt_static_windows.bat | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fb0bbd..ea91bc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -154,13 +154,7 @@ jobs: uses: actions/cache@v4.2.3 with: path: qt6/build - key: QtStaticCache-${{ matrix.platform }}-${{ matrix.target }}-Qt${{ matrix.qt_version }}-${{ hashFiles('script/build_qt_static_windows.bat') }} - - name: Install OpenSSL (Windows) - if: matrix.platform == 'windows-latest' && steps.cache-static-Qt.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' - shell: powershell - run: | - echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - vcpkg install openssl:x64-mingw-static + key: QtStaticCache-${{ matrix.platform }}-${{ matrix.target }}-Qt${{ matrix.qt_version }} - name: Install Qt Windows shell: powershell if: matrix.platform == 'windows-latest' && steps.cache-static-Qt.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' @@ -182,7 +176,7 @@ jobs: mkdir build cd build curl -fLso srslist.h "https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/srslist.h" - cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DOPENSSL_ROOT_DIR="$VCPKG_ROOT/installed/x64-mingw-static" -DCMAKE_BUILD_TYPE=Debug .. + cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DCMAKE_BUILD_TYPE=Debug .. ninja -j2 cd .. ./script/deploy_windows.sh diff --git a/script/build_qt_static_windows.bat b/script/build_qt_static_windows.bat index 6ceae92..da31317 100644 --- a/script/build_qt_static_windows.bat +++ b/script/build_qt_static_windows.bat @@ -3,7 +3,7 @@ cd qt6 git switch %1 mkdir build -CALL .\configure.bat -openssl-linked -release -static -prefix ./build -static-runtime -submodules qtbase,qtimageformats,qtsvg,qttranslations -skip tests -skip examples -gui -widgets -init-submodules -- -D OPENSSL_ROOT_DIR="%VCPKG_ROOT%/installed/x64-mingw-static" +CALL .\configure.bat -release -static -prefix ./build -static-runtime -submodules qtbase,qtimageformats,qtsvg,qttranslations -skip tests -skip examples -gui -widgets -init-submodules echo on branch %1 echo config complete, building... cmake --build . --parallel From fff4359976030a454ca82d227d9ad7753b72e654 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:46:10 +0800 Subject: [PATCH 6/6] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea91bc7..7287627 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -177,7 +177,7 @@ jobs: cd build curl -fLso srslist.h "https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/srslist.h" cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DCMAKE_BUILD_TYPE=Debug .. - ninja -j2 + ninja cd .. ./script/deploy_windows.sh - name: Legacy Windows - Generate MakeFile and Build