Skip to content

Commit 9d9d805

Browse files
address pr comments
1 parent 159606d commit 9d9d805

5 files changed

Lines changed: 20 additions & 4 deletions

File tree

.github/workflows/ci-macos-dmg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ on:
3535
env:
3636
CARGO_TERM_COLOR: always
3737
INPUT_RELEASE_VERSION: ${{ inputs.release_version }}
38-
MACOSX_DEPLOYMENT_TARGET: 14.2
38+
MACOSX_DEPLOYMENT_TARGET: "14.2"
3939

4040
jobs:
4141
build_dmg:

packaging/linux/flatpak/dev.lizardbyte.app.Koko.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ separate-locales: false
1616

1717
finish-args:
1818
- --filesystem=home
19+
- --filesystem=host:ro
1920
- --share=network
2021
- --share=ipc
2122
- --socket=fallback-x11
@@ -33,7 +34,8 @@ cleanup:
3334

3435
modules:
3536
- shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json
36-
- modules/xdotool.json
37+
# Required by the Linux tray/menu stack through the muda crate.
38+
- modules/libxdo.json
3739

3840
- name: koko
3941
buildsystem: simple
@@ -69,6 +71,10 @@ modules:
6971
install -Dm0644
7072
packaging/linux/flatpak/dev.lizardbyte.app.Koko.metainfo.xml
7173
/app/share/metainfo/dev.lizardbyte.app.Koko.metainfo.xml
74+
run-tests: true
75+
test-rule: ""
76+
test-commands:
77+
- cargo test --offline --locked --workspace --lib --bins --release
7278
sources:
7379
- type: git
7480
url: "@GITHUB_CLONE_URL@"

packaging/linux/flatpak/exceptions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"appid-url-not-reachable",
44
"appstream-screenshots-not-mirrored-in-ostree",
55
"metainfo-missing-screenshots",
6+
"finish-args-host-ro-filesystem-access",
67
"finish-args-home-filesystem-access"
78
]
89
}

packaging/linux/flatpak/modules/xdotool.json renamed to packaging/linux/flatpak/modules/libxdo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "xdotool",
2+
"name": "libxdo",
33
"buildsystem": "simple",
44
"build-commands": [
55
"make libxdo.so libxdo.so.4 libxdo.pc PREFIX=\"${FLATPAK_DEST}\" WITHOUT_RPATH_FIX=1",

packaging/macos/package-dmg.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Options:
2222
--output-dir PATH Directory for the generated DMG. Default: artifacts.
2323
--sign Sign the app bundle and DMG with APPLE_CODESIGN_IDENTITY.
2424
-h, --help Show this help text.
25+
26+
Environment:
27+
MACOSX_DEPLOYMENT_TARGET Minimum macOS version to write into Info.plist.
2528
EOF
2629
}
2730

@@ -116,6 +119,12 @@ if [[ -z "${bundle_version}" ]]; then
116119
bundle_version="0"
117120
fi
118121

122+
minimum_system_version="${MACOSX_DEPLOYMENT_TARGET:-}"
123+
if [[ -z "${minimum_system_version}" ]]; then
124+
echo "MACOSX_DEPLOYMENT_TARGET must be set to write LSMinimumSystemVersion." >&2
125+
exit 1
126+
fi
127+
119128
package_dir="${work_dir}/${target}"
120129
app_dir="${package_dir}/${app_name}.app"
121130
contents_dir="${app_dir}/Contents"
@@ -172,7 +181,7 @@ cat > "${contents_dir}/Info.plist" <<EOF
172181
<key>LSApplicationCategoryType</key>
173182
<string>public.app-category.entertainment</string>
174183
<key>LSMinimumSystemVersion</key>
175-
<string>14.2</string>
184+
<string>${minimum_system_version}</string>
176185
<key>LSUIElement</key>
177186
<true/>
178187
<key>NSLocalNetworkUsageDescription</key>

0 commit comments

Comments
 (0)