diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3cd40f4..a489d31 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,7 +15,7 @@ on: jobs: linux: - name: "Ubuntu 22.04LTS x86_64" + name: "Linux AppImage x86_64" runs-on: ubuntu-22.04 steps: @@ -28,11 +28,6 @@ jobs: target: 'desktop' arch: 'gcc_64' - - name: Install AppImage - run: | - wget -q https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O appimagetool - chmod a+x appimagetool - - name: Checkout Repository uses: actions/checkout@v4 with: @@ -46,21 +41,21 @@ jobs: - name: CMake Build run: cmake --build . -j`nproc` - - name: Install + - name: Package + env: + LD_LIBRARY_PATH: ${{env.Qt5_Dir}}/lib:$LD_LIBRARY_PATH run: | - mkdir AppDir - mv 86boxman AppDir - - #- name: CMake Install - # env: - # DESTDIR: "AppDir" - # run: cmake --install . --prefix /usr + wget -q https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage + sudo apt install libfuse2 + chmod a+x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage + mkdir AppDir Package + ./linuxdeploy-x86_64.AppImage --appdir AppDir -e 86boxman -d res/86boxman.desktop --output Package/86boxman-x86_64.AppImage --plugin qt - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: '86boxman Ubuntu 22.04LTS x86_64' - path: AppDir + name: '86boxman AppImage x86_64' + path: Package windows: name: "Windows x86_64 (MXE)" @@ -107,7 +102,7 @@ jobs: path: Package macos: - name: "MacOS 11 x86_64" + name: "MacOS x86_64" runs-on: macos-11 steps: @@ -152,5 +147,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: '86boxman MacOS 11 x86_64' + name: '86boxman MacOS x86_64' path: Package \ No newline at end of file diff --git a/res/86boxman.desktop b/res/86boxman.desktop index a41aa0a..f6b3ca9 100644 --- a/res/86boxman.desktop +++ b/res/86boxman.desktop @@ -16,7 +16,7 @@ Comment=Manage your 86Box virtual machines Exec=86boxman # The name of the icon that will be used to display this entry -Icon=jmemorize +# Icon=todo # Describes whether this application needs to be run in a terminal or not Terminal=false