Update main.yml

This commit is contained in:
Alex Spataru 2021-01-13 21:34:18 -05:00 committed by GitHub
parent d587e99cee
commit e4f842532f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,8 +21,8 @@ env:
EXECUTABLE: "SerialStudio"
APPLICATION: "Serial Studio"
QMAKE_PROJECT: "Serial-Studio.pro"
QML_DIR: "${{env.GITHUB_WORKSPACE}}/assets/qml"
QML_DIR_WIN: "${{env.GITHUB_WORKSPACE}}\\assets\\qml"
QML_DIR: "assets/qml"
QML_DIR_WIN: "assets\\qml"
#--------------------------------------------------------------------------------
# Workflow jobs (GNU/Linux, macOS & Windows)
@ -74,7 +74,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="${{GITHUB_WORKSPACE}}/${{env.QML_DIR}}"
#
# Rename AppImage to match "%AppName%-%Version%-Linux.AppImage" format
@ -124,7 +124,7 @@ jobs:
#
- name: Deploy app
run: |
macdeployqt ${{env.EXECUTABLE}}.app -qmldir=${{env.QML_DIR}}
macdeployqt ${{env.EXECUTABLE}}.app -qmldir="${{GITHUB_WORKSPACE}}/${{env.QML_DIR}}"
mv "${{env.EXECUTABLE}}.app" "${{env.APPLICATION}}.app"
#
@ -198,7 +198,7 @@ jobs:
mkdir bin
move relase/${{env.EXECUTABLE}}.exe bin
cd bin
windeployqt ${{env.EXECUTABLE}}.exe -qmldir=${{env.QML_DIR}} --compiler-runtime
windeployqt ${{env.EXECUTABLE}}.exe -qmldir="${{GITHUB_WORKSPACE}}\${{env.QML_DIR}}" --compiler-runtime
cd ..
mkdir "${{env.APPLICATION}}"
move bin "${{env.APPLICATION}}"