QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Fix typos & hard-type QML directories

Browse Source
This commit is contained in:
Alex Spataru 2021-01-13 21:46:16 -05:00 committed by GitHub
parent 3d6e859964
commit 2f41912661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/main.yml vendored
View File

@ -21,8 +21,9 @@ env:
EXECUTABLE: "SerialStudio"
APPLICATION: "Serial Studio"
QMAKE_PROJECT: "Serial-Studio.pro"
QML_DIR: "{github.workspace}/assets/qml"
QML_DIR_WIN: "{github.workspace}\\assets\\qml"
QML_DIR_MAC: "/Users/runner/work/Serial-Studio/assets/qml"
QML_DIR_LINUX: "/home/runner/work/Serial-Studio/assets/qml"
QML_DIR_WIN: "D:\\a\\Serial-Studio\\Serial-Studio\\assets\\qml"
#--------------------------------------------------------------------------------
# Workflow jobs (GNU/Linux, macOS & Windows)
@ -74,7 +75,7 @@ jobs:
make INSTALL_ROOT=appdir install
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -O linuxdeployqt
chmod a+x linuxdeployqt
./linuxdeployqt appdir/usr/share/applications/*.desktop -appimage -bundle-non-qt-libs -extra-plugins=imageformats/libqsvg.so -qmldir="${{env.QML_DIR}}"
./linuxdeployqt appdir/usr/share/applications/*.desktop -appimage -bundle-non-qt-libs -extra-plugins=imageformats/libqsvg.so -qmldir="${{env.QML_DIR_LINUX}}"
#
# Rename AppImage to match "%AppName%-%Version%-Linux.AppImage" format
@ -124,7 +125,7 @@ jobs:
#
- name: Deploy app
run: |
macdeployqt ${{env.EXECUTABLE}}.app -qmldir="${{env.QML_DIR}}"
macdeployqt ${{env.EXECUTABLE}}.app -qmldir="${{env.QML_DIR_MAC}}"
mv "${{env.EXECUTABLE}}.app" "${{env.APPLICATION}}.app"
#
@ -196,7 +197,7 @@ jobs:
- name: Deploy
run: |
mkdir bin
move relase/${{env.EXECUTABLE}}.exe bin
move release/${{env.EXECUTABLE}}.exe bin
cd bin
windeployqt ${{env.EXECUTABLE}}.exe -qmldir="${{env.QML_DIR_WIN}}" --compiler-runtime
cd ..