diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index acd0fb49..1be8b3f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 ..