From 6ea0d1c4ad7497a1490575697a7a459f3a465dd6 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 11:23:09 -0500 Subject: [PATCH 01/12] Add information about build time and git hash to the log output --- Cargo.lock | 603 ++++++++++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 5 + build.rs | 18 ++ rustfmt.toml | 2 +- src/app.rs | 6 + 5 files changed, 623 insertions(+), 11 deletions(-) create mode 100644 build.rs diff --git a/Cargo.lock b/Cargo.lock index ceb6564..64dabcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,11 +2,20 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr 2.7.4", +] + [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "bitflags" @@ -36,12 +45,46 @@ dependencies = [ "iovec", ] +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cc" -version = "1.1.34" +version = "1.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" +checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf" dependencies = [ + "jobserver", + "libc", "shlex", ] @@ -141,6 +184,41 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + [[package]] name = "ddc" version = "0.2.2" @@ -216,6 +294,37 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "dirs" version = "5.0.1" @@ -257,9 +366,21 @@ dependencies = [ "shell-words", "simplelog", "uinput", + "vergen-git2", "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dlv-list" version = "0.5.2" @@ -290,6 +411,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "406ac2a8c9eedf8af9ee1489bee9e50029278a6456c740f7454cf8a158abc816" +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foreign-types" version = "0.5.0" @@ -317,6 +444,15 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "gcc" version = "0.3.55" @@ -334,6 +470,19 @@ dependencies = [ "wasi", ] +[[package]] +name = "git2" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +dependencies = [ + "bitflags 2.6.0", + "libc", + "libgit2-sys", + "log", + "url", +] + [[package]] name = "hashbrown" version = "0.14.5" @@ -373,6 +522,151 @@ dependencies = [ "libc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "io-kit-sys" version = "0.4.1" @@ -404,11 +698,32 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + [[package]] name = "libc" -version = "0.2.161" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" + +[[package]] +name = "libgit2-sys" +version = "0.17.0+1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] [[package]] name = "libredox" @@ -452,12 +767,30 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libz-sys" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "log" version = "0.4.22" @@ -634,6 +967,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + [[package]] name = "pkg-config" version = "0.3.31" @@ -675,6 +1014,35 @@ dependencies = [ "thiserror", ] +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr 2.7.4", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr 2.7.4", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + [[package]] name = "resize-slice" version = "0.1.3" @@ -704,6 +1072,27 @@ dependencies = [ "ordered-multimap", ] +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + [[package]] name = "serde" version = "1.0.214" @@ -724,6 +1113,18 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_json" +version = "1.0.132" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +dependencies = [ + "itoa", + "memchr 2.7.4", + "ryu", + "serde", +] + [[package]] name = "serde_yaml" version = "0.7.5" @@ -759,6 +1160,24 @@ dependencies = [ "time", ] +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "syn" version = "2.0.87" @@ -770,6 +1189,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -781,18 +1211,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", @@ -841,6 +1271,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "udev" version = "0.2.0" @@ -887,12 +1327,76 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74c1aa4511c38276c548406f0b1f5f8b793f000cfb51e18f278a102abd057e81" +[[package]] +name = "url" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vergen" +version = "9.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349ed9e45296a581f455bc18039878f409992999bc1d5da12a6800eb18c8752f" +dependencies = [ + "anyhow", + "cargo_metadata", + "derive_builder", + "regex", + "rustversion", + "time", + "vergen-lib", +] + +[[package]] +name = "vergen-git2" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e771aff771c0d7c2f42e434e2766d304d917e29b40f0424e8faaaa936bbc3f29" +dependencies = [ + "anyhow", + "derive_builder", + "git2", + "rustversion", + "time", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229eaddb0050920816cf051e619affaf18caa3dd512de8de5839ccbc8e53abb0" +dependencies = [ + "anyhow", + "derive_builder", + "rustversion", +] + [[package]] name = "void" version = "1.0.2" @@ -1081,6 +1585,18 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "yaml-rust" version = "0.4.5" @@ -1089,3 +1605,70 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index dd94be7..ddc4759 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,8 @@ edition = "2021" description = "An utility to watch for USB device connect/disconnect events and switch display inputs via DDC/CI" readme = "README.md" repository = "https://github.com/haimgel/display-switch/" +homepage = "https://github.com/haimgel/display-switch/" +build = "build.rs" license = "MIT" [dependencies] @@ -21,6 +23,9 @@ ddc-hi = "0.4" rusb = "^0.9" shell-words = "1.0" +[build-dependencies] +vergen-git2 = { version = "1.0.0", features = ["build", "cargo"] } + [target.'cfg(target_os = "macos")'.dependencies] ddc-macos = "0.2.2" diff --git a/build.rs b/build.rs new file mode 100644 index 0000000..f6151c4 --- /dev/null +++ b/build.rs @@ -0,0 +1,18 @@ +use std::error::Error; +use vergen_git2::{BuildBuilder, Emitter, Git2Builder}; + +fn main() -> Result<(), Box> { + let build = BuildBuilder::all_build()?; + let git = Git2Builder::default() + .branch(true) + .sha(true) + .commit_timestamp(true) + .dirty(true) + .describe(true, true, None) + .build()?; + Emitter::default() + .add_instructions(&build)? + .add_instructions(&git)? + .emit()?; + Ok(()) +} diff --git a/rustfmt.toml b/rustfmt.toml index 6bd86d3..481ef24 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,3 +1,3 @@ max_width = 120 -style_edition = "2021" +edition = "2021" use_try_shorthand = true diff --git a/src/app.rs b/src/app.rs index 3c3cfff..6dd7c07 100644 --- a/src/app.rs +++ b/src/app.rs @@ -40,6 +40,12 @@ impl usb::UsbCallback for App { impl App { pub fn new() -> Result { logging::init_logging().context("failed to initialize logging")?; + info!( + "display-switch v{version} built on {timestamp} from git {git}", + version = env!("CARGO_PKG_VERSION"), + timestamp = env!("VERGEN_BUILD_TIMESTAMP"), + git = env!("VERGEN_GIT_DESCRIBE"), + ); let config = Configuration::load().context("failed to load configuration")?; Ok(Self { config }) From c0b6b33789ad5047317ee4bfe655e032b16972e7 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 11:41:44 -0500 Subject: [PATCH 02/12] Build universal binaries for MacOS --- .github/workflows/build.yml | 4 +-- Makefile | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 Makefile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9aa6266..612ee91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,10 +43,10 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Build - run: cargo build --release + run: make build-release - name: Run tests - run: cargo test + run: make test - name: Run executable run: ./target/release/display_switch --version diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5cc4f0e --- /dev/null +++ b/Makefile @@ -0,0 +1,51 @@ +BINARY := display_switch +INTEL_ARCH := x86_64-apple-darwin +ARM_ARCH := aarch64-apple-darwin +UNAME_S := $(shell uname -s) + +# Targets for different build modes +.PHONY: build-debug build-release all test + +# macOS specific debug build: creates a universal debug binary +ifeq ($(UNAME_S), Darwin) +build-debug: target/debug/$(BINARY) + +build-release: target/release/$(BINARY) + +target/debug/$(BINARY): target/$(INTEL_ARCH)/debug/$(BINARY) target/$(ARM_ARCH)/debug/$(BINARY) + mkdir -p "target/debug" + lipo -create -output $@ \ + "target/$(INTEL_ARCH)/debug/$(BINARY)" \ + "target/$(ARM_ARCH)/debug/$(BINARY)" + +target/release/$(BINARY): target/$(INTEL_ARCH)/release/$(BINARY) target/$(ARM_ARCH)/release/$(BINARY) + mkdir -p "target/release" + lipo -create -output $@ \ + "target/$(INTEL_ARCH)/release/$(BINARY)" \ + "target/$(ARM_ARCH)/release/$(BINARY)" + +target/$(INTEL_ARCH)/debug/$(BINARY): + cargo build --target $(INTEL_ARCH) --debug + +target/$(ARM_ARCH)/debug/$(BINARY): + cargo build --target $(ARM_ARCH) --debug + +target/$(INTEL_ARCH)/release/$(BINARY): + cargo build --target $(INTEL_ARCH) --release + +target/$(ARM_ARCH)/release/$(BINARY): + cargo build --target $(ARM_ARCH) --release + +# Non-macOS build: defaults to standard cargo build +else +build-debug: + cargo build --debug + +build-release: + cargo build --release +endif + +.all: build-debug + +.test: + cargo test From bd396b2cfd4e31d386dcc5bff92c265efc731ad1 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 12:35:19 -0500 Subject: [PATCH 03/12] Make sure Rust targets are installed --- Makefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5cc4f0e..00677d6 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ARM_ARCH := aarch64-apple-darwin UNAME_S := $(shell uname -s) # Targets for different build modes -.PHONY: build-debug build-release all test +.PHONY: build-debug build-release all test clean # macOS specific debug build: creates a universal debug binary ifeq ($(UNAME_S), Darwin) @@ -25,10 +25,12 @@ target/release/$(BINARY): target/$(INTEL_ARCH)/release/$(BINARY) target/$(ARM_AR "target/$(ARM_ARCH)/release/$(BINARY)" target/$(INTEL_ARCH)/debug/$(BINARY): - cargo build --target $(INTEL_ARCH) --debug + rustup target add $(INTEL_ARCH) + cargo build --target $(INTEL_ARCH) target/$(ARM_ARCH)/debug/$(BINARY): - cargo build --target $(ARM_ARCH) --debug + rustup target add $(ARM_ARCH) + cargo build --target $(ARM_ARCH) target/$(INTEL_ARCH)/release/$(BINARY): cargo build --target $(INTEL_ARCH) --release @@ -39,13 +41,16 @@ target/$(ARM_ARCH)/release/$(BINARY): # Non-macOS build: defaults to standard cargo build else build-debug: - cargo build --debug + cargo build build-release: cargo build --release endif -.all: build-debug +all: build-debug -.test: +test: cargo test + +clean: + cargo clean From ffe6fa92d113f41ef25ccd0f62161c6f9765852f Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 12:41:59 -0500 Subject: [PATCH 04/12] Refactor Makefile --- Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 00677d6..766cc4b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ARM_ARCH := aarch64-apple-darwin UNAME_S := $(shell uname -s) # Targets for different build modes -.PHONY: build-debug build-release all test clean +.PHONY: build-debug build-release all test clean setup-$(INTEL_ARCH) setup-$(ARM_ARCH) # macOS specific debug build: creates a universal debug binary ifeq ($(UNAME_S), Darwin) @@ -12,6 +12,12 @@ build-debug: target/debug/$(BINARY) build-release: target/release/$(BINARY) +setup-$(INTEL_ARCH): + rustup target add $(INTEL_ARCH) + +setup-$(ARM_ARCH): + rustup target add $(ARM_ARCH) + target/debug/$(BINARY): target/$(INTEL_ARCH)/debug/$(BINARY) target/$(ARM_ARCH)/debug/$(BINARY) mkdir -p "target/debug" lipo -create -output $@ \ @@ -24,18 +30,16 @@ target/release/$(BINARY): target/$(INTEL_ARCH)/release/$(BINARY) target/$(ARM_AR "target/$(INTEL_ARCH)/release/$(BINARY)" \ "target/$(ARM_ARCH)/release/$(BINARY)" -target/$(INTEL_ARCH)/debug/$(BINARY): - rustup target add $(INTEL_ARCH) +target/$(INTEL_ARCH)/debug/$(BINARY): setup-$(INTEL_ARCH) cargo build --target $(INTEL_ARCH) -target/$(ARM_ARCH)/debug/$(BINARY): - rustup target add $(ARM_ARCH) +target/$(ARM_ARCH)/debug/$(BINARY): setup-$(ARM_ARCH) cargo build --target $(ARM_ARCH) -target/$(INTEL_ARCH)/release/$(BINARY): +target/$(INTEL_ARCH)/release/$(BINARY): setup-$(INTEL_ARCH) cargo build --target $(INTEL_ARCH) --release -target/$(ARM_ARCH)/release/$(BINARY): +target/$(ARM_ARCH)/release/$(BINARY): setup-$(ARM_ARCH) cargo build --target $(ARM_ARCH) --release # Non-macOS build: defaults to standard cargo build From c04a526d17fe83ed891c132607222118e5040906 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 15:06:09 -0500 Subject: [PATCH 05/12] Have targets in the matrix --- .github/workflows/build.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 612ee91..db08fc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,28 +19,23 @@ jobs: fail-fast: false max-parallel: 3 matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + job: + - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu } + - { os: macos-latest, target: universal2-apple-darwin } + - { os: windows-latest, target: x86_64-pc-windows-msvc } - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.job.os }} steps: - name: Install build dependencies (Linux) - if: matrix.os == 'ubuntu-latest' + if: matrix.job.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install libudev-dev - uses: actions/checkout@v4 - - uses: actions/cache@v4 - with: - # https://doc.rust-lang.org/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - uses: Swatinem/rust-cache@v2 - name: Build run: make build-release From 520143e6ae0663b5aaf12fa93ceb59934ee3d2a5 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 15:32:38 -0500 Subject: [PATCH 06/12] Correct artifact names --- .github/workflows/build.yml | 40 ++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db08fc2..4597025 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,15 +14,31 @@ env: RUST_BACKTRACE: full jobs: + crate_metadata: + name: Extract crate metadata + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Extract crate information + id: crate_metadata + run: | + cargo metadata --no-deps --format-version 1 | jq -r '"name=" + .packages[0].name' | tee -a $GITHUB_OUTPUT + cargo metadata --no-deps --format-version 1 | jq -r '"version=" + .packages[0].version' | tee -a $GITHUB_OUTPUT + outputs: + name: ${{ steps.crate_metadata.outputs.name }} + version: ${{ steps.crate_metadata.outputs.version }} + build: + name: Build (${{ matrix.job.short_target }}) + needs: [crate_metadata] strategy: fail-fast: false max-parallel: 3 matrix: job: - - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu } - - { os: macos-latest, target: universal2-apple-darwin } - - { os: windows-latest, target: x86_64-pc-windows-msvc } + - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu, short_target: linux-amd64 } + - { os: macos-latest, target: universal2-apple-darwin, short_target: macos-universal } + - { os: windows-latest, target: x86_64-pc-windows-msvc, short_target: windows-amd64 } runs-on: ${{ matrix.job.os }} @@ -46,10 +62,20 @@ jobs: - name: Run executable run: ./target/release/display_switch --version + - name: Package + id: package + shell: bash + run: | + PACKAGE_DIR="target/package" + mkdir -p "$PACKAGE_DIR" + PACKAGE_NAME="display_switch-v${{ needs.crate_metadata.outputs.version }}-${{ matrix.job.short_target }}.zip" + PACKAGE_FILE="$PACKAGE_DIR/$PACKAGE_NAME" + zip -j $PACKAGE_FILE target/release/display_switch* README.md LICENSE + echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_OUTPUT + echo "PACKAGE_FILE=$PACKAGE_FILE" >> $GITHUB_OUTPUT + - uses: actions/upload-artifact@v4 with: - name: ${{ runner.os }} if-no-files-found: error - path: | - target/release/display_switch - target/release/display_switch.exe + name: ${{ steps.package.outputs.PACKAGE_NAME }} + path: ${{ steps.package.outputs.PACKAGE_FILE }} From 5e651542d7c8ac22b82937259bf0573f1e841023 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 15:47:03 -0500 Subject: [PATCH 07/12] Fix packaging --- .github/workflows/build.yml | 7 ++++++- Makefile | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4597025..f7dcab2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,10 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: full +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: crate_metadata: name: Extract crate metadata @@ -70,7 +74,8 @@ jobs: mkdir -p "$PACKAGE_DIR" PACKAGE_NAME="display_switch-v${{ needs.crate_metadata.outputs.version }}-${{ matrix.job.short_target }}.zip" PACKAGE_FILE="$PACKAGE_DIR/$PACKAGE_NAME" - zip -j $PACKAGE_FILE target/release/display_switch* README.md LICENSE + shopt -s extglob # To match the filename below (without any debug symbols) + zip -j $PACKAGE_FILE target/release/display_switch?(.exe) README.md LICENSE echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_OUTPUT echo "PACKAGE_FILE=$PACKAGE_FILE" >> $GITHUB_OUTPUT diff --git a/Makefile b/Makefile index 766cc4b..040a3ee 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ BINARY := display_switch INTEL_ARCH := x86_64-apple-darwin ARM_ARCH := aarch64-apple-darwin UNAME_S := $(shell uname -s) +VERSION := $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version') # Targets for different build modes .PHONY: build-debug build-release all test clean setup-$(INTEL_ARCH) setup-$(ARM_ARCH) @@ -58,3 +59,10 @@ test: clean: cargo clean + +package-release: build-release + mkdir -p "target/package" + zip -j target/package/$(BINARY)-v$(VERSION)-$(PLATFORM).zip target/release/$(BINARY)* README.md LICENSE + cp README.md LICENSE target/release/$(BINARY) target/package + cd target/package && zip -r $(BINARY)-v$(VERSION)-$(PLATFORM).zip $(BINARY) README.md LICENSE + echo "$(BINARY)-v$(VERSION)-$(PLATFORM).zip" From 289ebbb8d83ceec31a44aa381576778fad80f408 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 15:49:08 -0500 Subject: [PATCH 08/12] Install ZIP on Windows --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7dcab2..3efa170 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,6 +53,11 @@ jobs: sudo apt-get update sudo apt-get install libudev-dev + - name: Install build dependencies (Windows) + if: matrix.job.os == 'windows-latest' + run: | + choco install zip -y + - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 From f76fb3fac8a02c14ae9cb3b78b49e8b7c41cbd95 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 15:54:26 -0500 Subject: [PATCH 09/12] See if can get shasum on Windows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3efa170..eb70fe9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Install build dependencies (Windows) if: matrix.job.os == 'windows-latest' run: | - choco install zip -y + choco install zip shasum -y - uses: actions/checkout@v4 From b9f57ebc1b8181e63f66ea58b097e89c85aeb2d8 Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 16:04:28 -0500 Subject: [PATCH 10/12] Added release.yml --- .github/release.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 0000000..84cf526 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,21 @@ +changelog: + exclude: + labels: + - ignore-for-release + - github-actions + authors: + - renovate[bot] + categories: + - title: Breaking Changes 🛠 + labels: + - breaking-change + - title: Exciting New Features 🎉 + labels: + - enhancement + - feature + - title: Bug fixes 🐛 + labels: + - bug + - title: Other Changes 🔄 + labels: + - "*" From 6dd1b818a7cd0418b5577ee384027976b5af43cf Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 16:05:41 -0500 Subject: [PATCH 11/12] No shasum on Windows --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb70fe9..30c2e69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Install build dependencies (Windows) if: matrix.job.os == 'windows-latest' run: | - choco install zip shasum -y + choco install zip -y - uses: actions/checkout@v4 @@ -89,3 +89,8 @@ jobs: if-no-files-found: error name: ${{ steps.package.outputs.PACKAGE_NAME }} path: ${{ steps.package.outputs.PACKAGE_FILE }} + + - name: Release + uses: actions/download-artifact@v2 + with: + name: ${{ needs.build.outputs.PACKAGE_NAME }} \ No newline at end of file From f124d9f9073680098bc76cd4b31b077b73cfe16a Mon Sep 17 00:00:00 2001 From: Haim Gelfenbeyn Date: Mon, 11 Nov 2024 16:07:44 -0500 Subject: [PATCH 12/12] Test release packaging --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30c2e69..a78004c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,6 +91,9 @@ jobs: path: ${{ steps.package.outputs.PACKAGE_FILE }} - name: Release - uses: actions/download-artifact@v2 + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') with: - name: ${{ needs.build.outputs.PACKAGE_NAME }} \ No newline at end of file + draft: true # temporary, for testing + generate_release_notes: true + files: ${{ steps.package.outputs.PACKAGE_FILE }} \ No newline at end of file