From 17d20c4d470dc2ad2be2c2e1f7b81c8d29bf4a7c Mon Sep 17 00:00:00 2001 From: Le Tan Date: Mon, 18 Sep 2023 21:58:13 +0800 Subject: [PATCH] fix ci --- .github/workflows/ci-win.yml | 12 +----------- package/qt.conf | 2 ++ 2 files changed, 3 insertions(+), 11 deletions(-) create mode 100644 package/qt.conf diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 627410d890..abaeb25f57 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -63,12 +63,6 @@ jobs: run: mkdir build working-directory: ${{runner.workspace}} - - name: Clone OpenSSL - shell: bash - run: | - git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git --depth=1 - working-directory: ${{runner.workspace}}/build - - name: Configure and Build Project shell: cmd run: | @@ -89,11 +83,7 @@ jobs: copy .\src\release\vnote_extra.rcc "%DISTRIB_PATH%\vnote_extra.rcc" copy .\libs\vtextedit\src\libs\syntax-highlighting\release\VSyntaxHighlighting.dll "%DISTRIB_PATH%\VSyntaxHighlighting.dll" copy .\libs\vtextedit\src\editor\release\VTextEdit.dll "%DISTRIB_PATH%\VTextEdit.dll" - rem set qt_dir=%Qt5_Dir:/=\% - rem for %%I in ("%qt_dir%\..\..") do set "qt_topdir=%%~fI" - rem set openssl_dir=%qt_topdir%\Tools\OpenSSL\Win_${{matrix.config.platform}}\bin - set openssl_dir=openssl-utils.git\1.1.1j\Win_${{matrix.config.platform}} - copy %openssl_dir%\lib*.dll "%DISTRIB_PATH%\" + copy "%GITHUB_WORKSPACE%\package\qt.conf" "%DISTRIB_PATH%\qt.conf" copy "%GITHUB_WORKSPACE%\README.md" "%DISTRIB_PATH%\README.md" copy "%GITHUB_WORKSPACE%\COPYING.LESSER" "%DISTRIB_PATH%\COPYING.LESSER" echo %GITHUB_SHA% > "%DISTRIB_PATH%\commit" diff --git a/package/qt.conf b/package/qt.conf new file mode 100644 index 0000000000..367a59eeb6 --- /dev/null +++ b/package/qt.conf @@ -0,0 +1,2 @@ +[Platforms] +WindowsArguments = fontengine=freetype