From d8f473e204a6e9a85cfa0867f1b6e09989727529 Mon Sep 17 00:00:00 2001 From: C Date: Thu, 17 Sep 2026 12:57:12 -0700 Subject: [PATCH] feat(ci): add appimage building a feat(ci): add appimage building feat(ci): add appimage building feat(ci): add appimage building asdsada Update build.yml Update LinuxDeploy.cmake --- .github/workflows/build.yml | 75 ++++++++++++++++++++++++++++++------- CMakeLists.txt | 2 +- cmake/LinuxDeploy.cmake | 12 ++++-- 3 files changed, 71 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62d6489..722ff10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: - name: Upload uses: actions/upload-artifact@v4 with: - name: loader + name: _loader path: | packages/* @@ -62,7 +62,7 @@ jobs: - name: Download loader artifacts uses: actions/download-artifact@v4 with: - name: loader + name: _loader - name: Select correct Xcode uses: mobiledevops/xcode-select-version-action@7b50160de7c8bd6a8c4ee2c2e6b5ee0983886c0b @@ -92,7 +92,7 @@ jobs: - name: Upload uses: actions/upload-artifact@v4 with: - name: embedded + name: _embedded path: | upload/* @@ -122,7 +122,7 @@ jobs: - name: Upload uses: actions/upload-artifact@v4 with: - name: pongo + name: _pongo path: | upload/* @@ -147,13 +147,13 @@ jobs: - name: Download Pongo uses: actions/download-artifact@v4 with: - name: pongo + name: _pongo path: embedded/ - name: Download embedded artifacts uses: actions/download-artifact@v4 with: - name: embedded + name: _embedded path: embedded/ - name: Download musl toolchain @@ -229,6 +229,53 @@ jobs: path: | build/*.tar.gz + build-linux-appimage: + runs-on: ${{ matrix.os }} + needs: [build-pongo, build-ramdisk] + + strategy: + fail-fast: true + matrix: + include: + - os: ubuntu-24.04 + arch: x86_64 + - os: ubuntu-24.04-arm + arch: aarch64 + + steps: + - uses: actions/checkout@v4 + with: + token: ${{ secrets.BUILD_GITHUB_TOKEN }} + submodules: recursive + + - name: Download Pongo + uses: actions/download-artifact@v4 + with: + name: _pongo + path: embedded/ + + - name: Download embedded artifacts + uses: actions/download-artifact@v4 + with: + name: _embedded + path: embedded/ + + - name: Install dependencies (apt) + run: | + sudo apt update + sudo apt install -y build-essential cmake autoconf automake libtool pkg-config zstd jq libwxgtk3.2-dev + + - name: Build + run: | + make package WITH_GUI=1 WITH_TUI=1 WITH_CIDERRAIN=1 BUILD_TYPE=Release JOBS=$(nproc) + + - name: Upload + uses: actions/upload-artifact@v4 + with: + name: palera1n-${{ matrix.arch }}-linux-gui + path: | + build/*.AppImage + build-macos: runs-on: ${{ matrix.os }} needs: [build-pongo, build-ramdisk] @@ -250,13 +297,13 @@ jobs: - name: Download Pongo uses: actions/download-artifact@v4 with: - name: pongo + name: _pongo path: embedded/ - name : Download embedded artifacts uses: actions/download-artifact@v4 with: - name: embedded + name: _embedded path: embedded/ - name: Install dependencies (brew) @@ -299,13 +346,13 @@ jobs: - name: Download Pongo uses: actions/download-artifact@v4 with: - name: pongo + name: _pongo path: embedded/ - name : Download embedded artifacts uses: actions/download-artifact@v4 with: - name: embedded + name: _embedded path: embedded/ - name: Install dependencies (brew) @@ -415,13 +462,13 @@ jobs: # - name: Download Pongo # uses: actions/download-artifact@v4 # with: - # name: pongo + # name: _pongo # path: embedded/ # - name: Download embedded artifacts # uses: actions/download-artifact@v4 # with: - # name: embedded + # name: _embedded # path: embedded/ # - name: Install dependencies (choco) @@ -484,13 +531,13 @@ jobs: - name: Download embedded artifacts uses: actions/download-artifact@v4 with: - name: embedded + name: _embedded path: embedded/ - name: Download Pongo uses: actions/download-artifact@v4 with: - name: pongo + name: _pongo path: embedded/ - name: Download Linux i486 Artifact diff --git a/CMakeLists.txt b/CMakeLists.txt index 86c01e9..41f76c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ else() target_link_libraries(palera1n PRIVATE ${CURSES_LIBRARIES}) endif() - if(NOT APPLE AND NOT CIDERRAIN) + if(NOT APPLE AND NOT WITH_CIDERRAIN) pkg_check_modules(LIBUSB REQUIRED libusb-1.0) target_include_directories(palera1n PRIVATE ${LIBUSB_INCLUDE_DIRS}) target_link_libraries(palera1n PRIVATE ${LIBUSB_LIBRARIES}) diff --git a/cmake/LinuxDeploy.cmake b/cmake/LinuxDeploy.cmake index d172f5f..65ca402 100644 --- a/cmake/LinuxDeploy.cmake +++ b/cmake/LinuxDeploy.cmake @@ -2,9 +2,15 @@ include(FetchContent) -set(LINUXDEPLOY_URL - "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" -) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64") + set(LINUXDEPLOY_URL + "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-aarch64.AppImage" + ) +else() + set(LINUXDEPLOY_URL + "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" + ) +endif() set(LINUXDEPLOY "${CMAKE_BINARY_DIR}/linuxdeploy"