From e4f842532f48d9bcbf27095745320e61724a9286 Mon Sep 17 00:00:00 2001 From: Alex Spataru Date: Wed, 13 Jan 2021 21:34:18 -0500 Subject: [PATCH] Update main.yml --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4930e1fb..57396005 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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}}"