mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-13 12:23:38 +01:00
build(komorebic): commit applications.json instead of fetching it in build.rs
The Windows and macOS komorebic embed applications.json with include_str!, and build.rs downloaded it when missing (the files were git-ignored). A build script that needs reqwest, and so openssl on Linux, cannot be part of one package that also builds there, and the download made nix builds depend on a copy step. The two files are now committed, byte-identical to the asc flake input (applications.json and applications.mac.json, checked with cmp); the Windows build.rs keeps only shadow-rs; the macOS build.rs is gone. The flake preBuild copy of the input file stays and is now a no-op. Not behaviour: same embedded bytes. Verified: fast-check --since base: Windows clippy PASS, macOS fake-CC check PASS (--locked, so Cargo.lock unchanged). Not verified: nix builds.
This commit is contained in:
1 parent
12870fa533
commit
e71791399f
8 files changed
+3585
-22
No files matched your search
@@ -4,7 +4,6 @@
|
||||
CHANGELOG.md
|
||||
dummy.go
|
||||
komorebic/applications.yaml
|
||||
komorebic/applications.json
|
||||
/.vs
|
||||
/bar-schema
|
||||
/komorebi-schema
|
||||
|
||||
@@ -2,6 +2,5 @@
|
||||
/result*
|
||||
/.idea
|
||||
/.direnv
|
||||
/komorebic/applications.json
|
||||
/komorebi-schema
|
||||
/bar-schema
|
||||
@@ -23,10 +23,6 @@ serde_json = { workspace = true }
|
||||
shadow-rs = { workspace = true }
|
||||
sysinfo = { workspace = true }
|
||||
|
||||
[build-dependencies]
|
||||
reqwest = { version = "0.12", features = ["blocking"] }
|
||||
shadow-rs = { workspace = true }
|
||||
|
||||
[features]
|
||||
default = ["schemars"]
|
||||
schemars = ["dep:schemars", "komorebi-client/default"]
|
||||
|
||||
@@ -0,0 +1,286 @@
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi-for-mac/master/schema.asc.json",
|
||||
"Archive Utility": {
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Archive Utility",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Cloudflare Warp": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Updater",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Cloudflare WARP",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Updating Cloudflare WARP",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Control Center": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Control Center",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"Discord": {
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Discord",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "DiscordUpdater",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Finder": {
|
||||
"tabbed": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Finder",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
],
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Finder",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Info",
|
||||
"matching_strategy": "EndsWith"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Finder",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Copy",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Ghostty": {
|
||||
"tabbed": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Ghostty",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
],
|
||||
"titleless": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Ghostty",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"Installer": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Installer",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"MobileDeviceUpdater": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "MobileDeviceUpdater",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"Notification Center": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Notification Center",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"Photos": {
|
||||
"titleless": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Photos",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"RustRover": {
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "java",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Update",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "RustRover",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "–",
|
||||
"matching_strategy": "DoesNotContain"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"SecurityAgent": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "SecurityAgent",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"System Information": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "System Information",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"System Settings": {
|
||||
"ignore": [
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "System Settings",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
},
|
||||
"Tailscale": {
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Tailscale",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Software Update",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Tailscale",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Updating Tailscale",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Zed": {
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Zed",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Open",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
"Zen": {
|
||||
"ignore": [
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Zen",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "File Upload",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Zen",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Enter name of file to save to",
|
||||
"matching_strategy": "StartsWith"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"kind": "Exe",
|
||||
"id": "Zen",
|
||||
"matching_strategy": "Equals"
|
||||
},
|
||||
{
|
||||
"kind": "Title",
|
||||
"id": "Picture-in-Picture",
|
||||
"matching_strategy": "Equals"
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
fn main() {
|
||||
if std::fs::metadata("applications.json").is_err() {
|
||||
let applications_json = reqwest::blocking::get(
|
||||
"https://raw.githubusercontent.com/LGUG2Z/komorebi-application-specific-configuration/master/applications.mac.json"
|
||||
).unwrap().text().unwrap();
|
||||
std::fs::write("applications.json", applications_json).unwrap();
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,6 @@ win-msgbox = "0.2"
|
||||
windows = { workspace = true }
|
||||
|
||||
[build-dependencies]
|
||||
reqwest = { version = "0.12", features = ["blocking"] }
|
||||
shadow-rs = { workspace = true }
|
||||
|
||||
[features]
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,12 +1,5 @@
|
||||
use shadow_rs::ShadowBuilder;
|
||||
|
||||
fn main() {
|
||||
if std::fs::metadata("applications.json").is_err() {
|
||||
let applications_json = reqwest::blocking::get(
|
||||
"https://raw.githubusercontent.com/LGUG2Z/komorebi-application-specific-configuration/master/applications.json"
|
||||
).unwrap().text().unwrap();
|
||||
std::fs::write("applications.json", applications_json).unwrap();
|
||||
}
|
||||
|
||||
ShadowBuilder::builder().build().unwrap();
|
||||
}
|
||||
Reference in new issue
Block a user