From 441ecb257c95d8b2a71603e10c0a3194725860a2 Mon Sep 17 00:00:00 2001 From: Damglador Date: Sun, 29 Jun 2025 02:53:49 +0200 Subject: [PATCH] Fix build --- .github/workflows/release.yml | 22 +++++++++++++++++++++- packaging/CMakeLists.txt | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a017f016..7bf876fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,6 +83,24 @@ jobs: run: | cd build cpack . + + - name: Install linuxdeploy + uses: miurahr/install-linuxdeploy-action@v1.8.0 + with: + plugins: qt + + - name: Build AppImage + run: | + NO_STRIP=1 ${{ steps.install-linuxdeploy.outputs.linuxdeploy }} \ + --plugin qt \ + -e build/isle \ + -e build/isle-config \ + -l build/liblego1.so \ + -d build/packaging/linux/org.legoisland.Isle.desktop \ + -i build/icons/@APP_ID@.svg \ + --custom-apprun=/packaging/linux/appimage/AppRun \ + --appdir=build/packaging/linux/appimage/AppDir \ + --output "dist/LEGO_Island-$(uname -m).AppImage" - name: Upload Artifact uses: actions/upload-artifact@main @@ -94,6 +112,8 @@ jobs: flatpak: name: "Flatpak (${{ matrix.arch }})" runs-on: ${{ matrix.os }} + needs: + - build strategy: fail-fast: false @@ -118,7 +138,7 @@ jobs: bundle: org.legoisland.Isle.${{ matrix.arch }}.flatpak manifest-path: packaging/linux/flatpak/org.legoisland.Isle.json arch: ${{ matrix.arch }} - + release: name: 'Release' runs-on: ubuntu-latest diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt index e75c96f4..c2c4f0df 100644 --- a/packaging/CMakeLists.txt +++ b/packaging/CMakeLists.txt @@ -5,7 +5,7 @@ set(APP_SPDX "LGPL-3.0-or-later") string(TIMESTAMP BUILD_DATE UTC) -file(COPY icons/isle.svg DESTINATION ${CMAKE_BINARY_DIR}/icons/"${APP_ID}.svg") +file(COPY_FILE icons/isle.svg "${CMAKE_BINARY_DIR}/icons/${APP_ID}.svg") # The following will need to be refined if we wish to post actual releases to a repo such as Flathub if(DEFINED ENV{GITHUB_ACTIONS} AND ENV{GITHUB_ACTIONS} EQUAL TRUE)