From b96830aa5e69557093830980acfd452089020564 Mon Sep 17 00:00:00 2001 From: Alex Spataru Date: Sun, 10 Jan 2021 22:43:42 -0500 Subject: [PATCH] Update main.yml --- .github/workflows/main.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa878d77..2031ac41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,18 +26,15 @@ jobs: cached: ${{ steps.cache-qt.outputs.cache-hit }} - name: Install dependencies - run: sudo apt update - sudo apt install libgl1-mesa-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libzstd-dev + run: sudo apt-get update; + sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libzstd-dev; - - name: Compile + - name: Create AppImage run: rm -rf build-linux - mkdir build-linux + mkdir build-linux cd build-linux qmake CONFIG+=release PREFIX=/usr ../Serial-Studio.pro - make - - - name: Create AppImage - run: make INSTALL_ROOT=appdir install + 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 @@ -51,7 +48,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: SerialStudio-1.0.5-Linux.AppImage - path: SerialStudio-1.0.5-Linux.AppImage + path: build-linux/SerialStudio-1.0.5-Linux.AppImage build-mac: runs-on: macos-latest @@ -77,13 +74,11 @@ jobs: cd build-mac qmake ../Serial-Studio.pro make - - - name: Create DMG - run: make dmg + make dmg mv *.dmg SerialStudio-1.0.5-macOS.dmg - name: Upload DMG uses: actions/upload-artifact@v2 with: name: SerialStudio-1.0.5-macOS.dmg - path: SerialStudio-1.0.5-macOS.dmg + path: build-mac/SerialStudio-1.0.5-macOS.dmg