Skip to content

Commit c287617

Browse files
authored
Merge pull request #239 from rainxchzed/generate-installers
2 parents f5d6abf + 6ac80c7 commit c287617

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

.github/workflows/build-desktop-platforms.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ env:
1616
-Dorg.gradle.daemon=false
1717
-Dorg.gradle.parallel=true
1818
-Dorg.gradle.caching=true
19-
-Dorg.gradle.configuration-cache=true
2019
2120
jobs:
2221
build-windows:
@@ -84,9 +83,9 @@ jobs:
8483
strategy:
8584
matrix:
8685
include:
87-
- os: macos-13
86+
- os: macos-15-intel
8887
arch: x64
89-
- os: macos-14
88+
- os: macos-latest
9089
arch: arm64
9190

9291
runs-on: ${{ matrix.os }}
@@ -152,12 +151,9 @@ jobs:
152151
strategy:
153152
matrix:
154153
include:
155-
# Ubuntu 24.04 (latest) — produces .deb with t64 deps (libasound2t64, libpng16-16t64)
156-
# Compatible with: Ubuntu 24.04+, Debian 13+ (Trixie)
157154
- os: ubuntu-latest
158155
label: modern
159-
# Ubuntu 22.04 — produces .deb with classic deps (libasound2, libpng16-16)
160-
# Compatible with: Debian 12 (Bookworm), Ubuntu 22.04, and older systems
156+
161157
- os: ubuntu-22.04
162158
label: debian12-compat
163159

composeApp/build.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,15 @@ compose.desktop {
102102
packageVersion = libs.versions.projectVersionName.get().toString()
103103
vendor = "rainxchzed"
104104
includeAllModules = true
105+
106+
val currentOs = org.gradle.internal.os.OperatingSystem.current()
105107
targetFormats(
106-
TargetFormat.Dmg,
107-
TargetFormat.Pkg,
108-
TargetFormat.Exe,
109-
TargetFormat.Msi,
110-
TargetFormat.Deb,
111-
TargetFormat.Rpm,
108+
*when {
109+
currentOs.isWindows -> arrayOf(TargetFormat.Exe, TargetFormat.Msi)
110+
currentOs.isMacOsX -> arrayOf(TargetFormat.Dmg, TargetFormat.Pkg)
111+
currentOs.isLinux -> arrayOf(TargetFormat.Deb, TargetFormat.Rpm, TargetFormat.AppImage)
112+
else -> emptyArray()
113+
}
112114
)
113115
windows {
114116
iconFile.set(project.file("logo/app_icon.ico"))

0 commit comments

Comments
 (0)