From 3c2ff5e8c70930673423d74fb5b45c29a92f03a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Mon, 23 Nov 2020 14:22:19 +0100 Subject: [PATCH] Workflow test without Qwt --- .github/workflows/Build.yml | 26 +++++++++++++------------ Software/PC_Application/Application.pro | 1 + 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index d4d9847..31dce01 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -1,12 +1,12 @@ name: Build on: - push: - branches: - - master - pull_request: - branches: - - master + push +# branches: +# - master +# pull_request: +# branches: +# - master jobs: PC_Application_Ubuntu: @@ -54,19 +54,21 @@ jobs: curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.7z 7z x libusb.7z -r -olibusb Xcopy /E /I /Y libusb\include ..\Qt\5.12.9\mingw73_64\include - dir - dir ..\Qt\5.12.9 - dir ..\Qt\5.12.9\mingw73_64 - dir C:\Qwt-6.1.4\lib - dir ..\Qt\5.12.9\mingw73_64\bin + Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application shell: cmd - name: Build application run: | cd Software/PC_Application + export LIBRARY_PATH + LIBRARY_PATH="../../libusb/MinGW64/static;$LIBRARY_PATH" qmake make -j9 - cd release + shell: cmd + + - name: Deploy application + run: | + cd Software/PC_Application/release del *.o *.cpp windeployqt.exe . copy ..\..\..\..\Qt\5.12.9\mingw73_64\bin\libwinpthread-1.dll . diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro index dddd718..38cd94a 100644 --- a/Software/PC_Application/Application.pro +++ b/Software/PC_Application/Application.pro @@ -100,6 +100,7 @@ SOURCES += \ LIBS += -lusb-1.0 unix:LIBS += -L/usr/lib/ +win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here QT += widgets