From 0ed6d0183b6b075435ec8f087796bbad8ff25310 Mon Sep 17 00:00:00 2001 From: GT190 Date: Sat, 7 Sep 2024 01:18:19 +0200 Subject: [PATCH 1/2] Add AppImage mode flag --- roles/buildbot/etc/master.cfg | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roles/buildbot/etc/master.cfg b/roles/buildbot/etc/master.cfg index c1bc58a..e76d930 100644 --- a/roles/buildbot/etc/master.cfg +++ b/roles/buildbot/etc/master.cfg @@ -474,6 +474,7 @@ def make_dolphin_linux_build(mode="normal"): pr = "pr" in mode fifoci_golden = "fifoci_golden" in mode generic = "generic" in mode + appimage = "appimage" in mode f.addStep(GitNoBranch(repourl="https://github.com/dolphin-emu/dolphin.git", progress=True, mode="incremental")) @@ -489,6 +490,8 @@ def make_dolphin_linux_build(mode="normal"): cmake_cmd.append("-DFASTLOG=ON") if generic: cmake_cmd.append("-DENABLE_GENERIC=ON") + if appimage: + cmake_cmd.append("-DLINUX_LOCAL_DEV=true -DCMAKE_INSTALL_PREFIX=/usr") cmake_cmd.append("-DDISTRIBUTOR=dolphin-emu.org") f.addStep(ShellCommand(command=cmake_cmd, workdir="build/build", @@ -508,6 +511,13 @@ def make_dolphin_linux_build(mode="normal"): descriptionDone="test", haltOnFailure=True)) + if appimage: + f.addStep(ShellCommand(command="../BuildLinuxAppImage.sh", + workdir="build/build", + description="Creating AppImage", + descriptionDone="Create AppImage", + haltOnFailure=True, + hideStepIf=StepWasSuccessful)) if fifoci_golden and pr: f.addStep(Trigger(schedulerNames=["pr-fifoci-lin"], copy_properties=["pr_id", "repo", "headrev", "branchname", "shortrev"], From bc8283f9ce230395f19ef97489b84ab7b2f308ab Mon Sep 17 00:00:00 2001 From: GT190 Date: Sat, 7 Sep 2024 16:01:50 +0200 Subject: [PATCH 2/2] Add AppImage packaging dependencies --- containers/ubuntu-lts-builder/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/containers/ubuntu-lts-builder/Dockerfile b/containers/ubuntu-lts-builder/Dockerfile index 2aaebc9..bd0eabc 100644 --- a/containers/ubuntu-lts-builder/Dockerfile +++ b/containers/ubuntu-lts-builder/Dockerfile @@ -12,6 +12,9 @@ RUN apt install -y \ libxi-dev libpangocairo-1.0-0 qt6-base-dev qt6-base-private-dev \ libqt6svg6-dev libbluetooth-dev libasound2-dev libpulse-dev libgl1-mesa-dev +# AppImage packaging dependencies +RUN apt install -y file desktop-file-utils + # Android build dependencies RUN apt install -y openjdk-11-jdk-headless openjdk-17-jdk-headless