diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8d27704..5839d2b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,7 +46,7 @@ jobs: ./libsearchonweb.dylib macos_arm64: - runs-on: macos-12 + runs-on: macos-14 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index be1143a..4b48d9d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,5 +37,43 @@ jobs: - name: Upload build asserts uses: actions/upload-artifact@v4 with: + name: libsearchonweb_mingw path: | ./release/searchonweb.dll + + windows_msvc2019: + runs-on: windows-2022 + + steps: + - uses: actions/checkout@v4 + with: + submodules: true + + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + arch: 'win64_msvc2019_64' + version: '6.5.3' + modules: 'qt5compat qtwebsockets qtserialport qtmultimedia' + aqtversion: '==3.1.7' + + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x64 + toolset: 14.29 + + - name: Build all + run: | + c:/Windows/system32/WindowsPowerShell/v1.0/powershell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -File "./tools/replacer.ps1" -cc_info "msvc" -tpath ./plugininterface/plugininterface.json.temp -opath ./plugininterface/plugininterface.json + lrelease searchonweb.pro + qmake searchonweb.pro -tp vc + msbuild searchonweb.vcxproj /p:Configuration=Release /p:Platform=x64 /p:BuildInParallel=false + cp ./release/searchonweb.dll ./release/searchonweb.msvc.dll + + - name: Upload build asserts + uses: actions/upload-artifact@v4 + with: + name: libsearchonweb_msvc + path: | + ./release/searchonweb.msvc.dll diff --git a/plugininterface b/plugininterface index 70ca512..7d02fe4 160000 --- a/plugininterface +++ b/plugininterface @@ -1 +1 @@ -Subproject commit 70ca512eecbb1fd9337c632ee86bd0fe13a111ca +Subproject commit 7d02fe423ed3e0be02fcf548c92c7901433effba diff --git a/searchonweb.pro b/searchonweb.pro index 524be1a..e32d983 100644 --- a/searchonweb.pro +++ b/searchonweb.pro @@ -15,17 +15,17 @@ RESOURCES = searchonweb.qrc TARGET = $$qtLibraryTarget(searchonweb) win32:{ - build_info.commands = $$quote("c:/Windows/system32/WindowsPowerShell/v1.0/powershell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -File \"$$PWD/tools/replacer.ps1\" -cc_info \\\"$$QMAKE_CXX\\\" -tpath $$PWD/plugininterface/plugininterface.json.temp -opath $$PWD/plugininterface/plugininterface.json") + build_info.commands = $$quote("c:/Windows/system32/WindowsPowerShell/v1.0/powershell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -File \"$$PWD/tools/replacer.ps1\" -cc_info $$QMAKE_CXX -tpath $$PWD/plugininterface/plugininterface.json.temp -opath $$PWD/plugininterface/plugininterface.json") } unix:!macx:{ QMAKE_RPATHDIR=$ORIGIN - build_info.commands = $$quote("cd $$PWD && ./tools/replacer.sh \\\"$$QMAKE_CXX\\\" $$PWD/plugininterface/plugininterface.json.temp $$PWD/plugininterface/plugininterface.json") + build_info.commands = $$quote("cd $$PWD && ./tools/replacer.sh $$QMAKE_CXX $$PWD/plugininterface/plugininterface.json.temp $$PWD/plugininterface/plugininterface.json") } macx:{ QMAKE_RPATHDIR=$ORIGIN - build_info.commands = $$quote("cd $$PWD && ./tools/replacer.sh \\\"$$QMAKE_CXX\\\" $$PWD/plugininterface/plugininterface.json.temp $$PWD/plugininterface/plugininterface.json") + build_info.commands = $$quote("cd $$PWD && ./tools/replacer.sh $$QMAKE_CXX $$PWD/plugininterface/plugininterface.json.temp $$PWD/plugininterface/plugininterface.json") } build_info.target = $$PWD/plugininterface/plugininterface.json