From cf64cd9c7644a7bad83edde265881ebaee4cc3a3 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 10:32:12 +0200 Subject: [PATCH 01/17] add drone ci config with clippy for amd64 --- peach-web/.drone.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 peach-web/.drone.yml diff --git a/peach-web/.drone.yml b/peach-web/.drone.yml new file mode 100644 index 0000000..0d1b66e --- /dev/null +++ b/peach-web/.drone.yml @@ -0,0 +1,11 @@ +kind: pipeline +name: test-on-amd64 + +platform: + arch: amd64 + +steps: +- name: clippy + image: rust:buster + commands: + - cargo clippy --verbose --all From a76ec08da6aa36a0982f025e1e8cec1d8a0e6578 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 10:36:10 +0200 Subject: [PATCH 02/17] move drone config to repo root and add triggers --- .drone.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..3923ab5 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,17 @@ +kind: pipeline +name: test-on-amd64 + +platform: + arch: amd64 + +steps: +- name: clippy + image: rust:buster + commands: + - cargo clippy --verbose --all + +trigger: + event: + include: + - push + - pull_request From 9ad580b86f7ddfacba0ad75a25ea1665de161b2b Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 10:43:35 +0200 Subject: [PATCH 03/17] install clippy in pipeline --- .drone.yml | 1 + peach-web/.drone.yml | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 peach-web/.drone.yml diff --git a/.drone.yml b/.drone.yml index 3923ab5..1fbc454 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,7 @@ steps: - name: clippy image: rust:buster commands: + - rustup component add clippy - cargo clippy --verbose --all trigger: diff --git a/peach-web/.drone.yml b/peach-web/.drone.yml deleted file mode 100644 index 0d1b66e..0000000 --- a/peach-web/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ -kind: pipeline -name: test-on-amd64 - -platform: - arch: amd64 - -steps: -- name: clippy - image: rust:buster - commands: - - cargo clippy --verbose --all From 27e9a8295c636590c3fbe09aeefbd216ba9fc4ea Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 10:50:37 +0200 Subject: [PATCH 04/17] update probes and lockfile to fix time build error --- Cargo.lock | 435 +++++++++++++++++++++++++++-------------------------- 1 file changed, 221 insertions(+), 214 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79940c0..0ea6b81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,8 +47,8 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ - "quote 1.0.15", - "syn 1.0.86", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -73,14 +73,14 @@ dependencies = [ "fastrand", "futures-lite", "once_cell", - "slab 0.4.5", + "slab 0.4.6", ] [[package]] name = "async-global-executor" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a" +checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" dependencies = [ "async-channel", "async-executor", @@ -101,11 +101,11 @@ dependencies = [ "concurrent-queue", "futures-lite", "libc", - "log 0.4.14", + "log 0.4.16", "once_cell", "parking", "polling", - "slab 0.4.5", + "slab 0.4.6", "socket2", "waker-fn", "winapi 0.3.9", @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" +checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" dependencies = [ "async-attributes", "async-channel", @@ -158,20 +158,20 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.7", + "crossbeam-utils 0.8.8", "futures-channel", "futures-core", "futures-io", "futures-lite", "gloo-timers", "kv-log-macro", - "log 0.4.14", + "log 0.4.16", "memchr", "num_cpus", "once_cell", "pin-project-lite", "pin-utils", - "slab 0.4.5", + "slab 0.4.6", "wasm-bindgen-futures", ] @@ -187,11 +187,11 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" dependencies = [ - "async-stream-impl 0.3.2", + "async-stream-impl 0.3.3", "futures-core", ] @@ -201,20 +201,20 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] name = "async-stream-impl" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -353,9 +353,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427" +checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" dependencies = [ "async-channel", "async-task", @@ -473,7 +473,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "time 0.1.44", + "time 0.1.43", "winapi 0.3.9", ] @@ -524,9 +524,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -600,9 +600,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -620,12 +620,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ - "quote 1.0.15", - "syn 1.0.86", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -645,10 +645,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.36", - "quote 1.0.15", + "proc-macro2 1.0.37", + "quote 1.0.17", "rustc_version 0.4.0", - "syn 1.0.86", + "syn 1.0.91", ] [[package]] @@ -691,9 +691,9 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -740,7 +740,7 @@ checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" dependencies = [ "atty", "humantime 1.3.0", - "log 0.4.14", + "log 0.4.16", "regex", "termcolor", ] @@ -753,7 +753,7 @@ checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime 2.1.0", - "log 0.4.14", + "log 0.4.16", "regex", "termcolor", ] @@ -766,7 +766,7 @@ checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime 2.1.0", - "log 0.4.14", + "log 0.4.16", "regex", "termcolor", ] @@ -803,9 +803,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", "synstructure", ] @@ -832,7 +832,7 @@ checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.11", + "redox_syscall 0.2.13", "winapi 0.3.9", ] @@ -970,9 +970,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -1003,7 +1003,7 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "slab 0.4.5", + "slab 0.4.6", ] [[package]] @@ -1066,13 +1066,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -1090,7 +1090,7 @@ dependencies = [ "aho-corasick", "bstr", "fnv", - "log 0.4.14", + "log 0.4.16", "regex", ] @@ -1109,10 +1109,10 @@ dependencies = [ [[package]] name = "golgi" version = "0.1.1" -source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git#77dd75bcd4649b7487069a61e2a8069b49f60a1d" +source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#77dd75bcd4649b7487069a61e2a8069b49f60a1d" dependencies = [ "async-std", - "async-stream 0.3.2", + "async-stream 0.3.3", "base64 0.13.0", "futures 0.3.21", "hex", @@ -1148,8 +1148,8 @@ dependencies = [ "futures 0.1.31", "http 0.1.21", "indexmap", - "log 0.4.14", - "slab 0.4.5", + "log 0.4.16", + "slab 0.4.6", "string", "tokio-io", ] @@ -1269,12 +1269,12 @@ dependencies = [ "httparse", "iovec", "language-tags", - "log 0.4.14", + "log 0.4.16", "mime", "net2", "percent-encoding 1.0.1", "relay", - "time 0.1.44", + "time 0.1.43", "tokio-core", "tokio-io", "tokio-proto", @@ -1298,10 +1298,10 @@ dependencies = [ "httparse", "iovec", "itoa 0.4.8", - "log 0.4.14", + "log 0.4.16", "net2", "rustc_version 0.2.3", - "time 0.1.44", + "time 0.1.43", "tokio 0.1.22", "tokio-buf", "tokio-executor", @@ -1315,9 +1315,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -1372,9 +1372,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg 1.1.0", "hashbrown", @@ -1428,7 +1428,7 @@ dependencies = [ "error-chain", "futures 0.1.31", "jsonrpc-core 8.0.1", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_json", ] @@ -1443,7 +1443,7 @@ dependencies = [ "futures 0.1.31", "hyper 0.11.27", "jsonrpc-client-core", - "log 0.4.14", + "log 0.4.16", "tokio-core", ] @@ -1457,7 +1457,7 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core 18.0.0", "jsonrpc-pubsub 18.0.0", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_json", "url 1.7.2", @@ -1483,7 +1483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b83fdc5e0218128d0d270f2f2e7a5ea716f3240c8518a58bc89e6716ba8581" dependencies = [ "futures 0.1.31", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_derive", "serde_json", @@ -1498,7 +1498,7 @@ dependencies = [ "futures 0.3.21", "futures-executor", "futures-util", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_derive", "serde_json", @@ -1513,7 +1513,7 @@ dependencies = [ "failure", "futures 0.1.31", "jsonrpc-core 11.0.0", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_json", ] @@ -1537,7 +1537,7 @@ dependencies = [ "hyper 0.12.36", "jsonrpc-core 11.0.0", "jsonrpc-server-utils 11.0.0", - "log 0.4.14", + "log 0.4.16", "net2", "unicase", ] @@ -1549,10 +1549,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ "futures 0.3.21", - "hyper 0.14.17", + "hyper 0.14.18", "jsonrpc-core 18.0.0", "jsonrpc-server-utils 18.0.0", - "log 0.4.14", + "log 0.4.16", "net2", "parking_lot 0.11.2", "unicase", @@ -1565,7 +1565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c233c4570183a45f7bde14cd7d23446d6c236de6df9442e53a60951adae9fd34" dependencies = [ "jsonrpc-core 11.0.0", - "log 0.4.14", + "log 0.4.16", "parking_lot 0.7.1", "serde 1.0.136", ] @@ -1579,7 +1579,7 @@ dependencies = [ "futures 0.3.21", "jsonrpc-core 18.0.0", "lazy_static", - "log 0.4.14", + "log 0.4.16", "parking_lot 0.11.2", "rand 0.7.3", "serde 1.0.136", @@ -1595,7 +1595,7 @@ dependencies = [ "globset", "jsonrpc-core 11.0.0", "lazy_static", - "log 0.4.14", + "log 0.4.16", "num_cpus", "tokio 0.1.22", "tokio-codec", @@ -1613,7 +1613,7 @@ dependencies = [ "globset", "jsonrpc-core 18.0.0", "lazy_static", - "log 0.4.14", + "log 0.4.16", "tokio 1.17.0", "tokio-stream", "tokio-util", @@ -1629,7 +1629,7 @@ dependencies = [ "jsonrpc-core 11.0.0", "jsonrpc-core-client 11.0.0", "jsonrpc-pubsub 11.0.0", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_json", ] @@ -1643,7 +1643,7 @@ dependencies = [ "jsonrpc-core 18.0.0", "jsonrpc-core-client 18.0.0", "jsonrpc-pubsub 18.0.0", - "log 0.4.14", + "log 0.4.16", "serde 1.0.136", "serde_json", ] @@ -1656,9 +1656,9 @@ checksum = "e72d8f524c7afd11d9c71614d1f814ee1c46377869933ce42d559d6973922f79" dependencies = [ "jsonrpc-core 11.0.0", "jsonrpc-server-utils 11.0.0", - "log 0.4.14", + "log 0.4.16", "parking_lot 0.7.1", - "slab 0.4.5", + "slab 0.4.6", "ws", ] @@ -1687,7 +1687,7 @@ dependencies = [ "futures 0.3.21", "hex", "kuska-sodiumoxide", - "log 0.4.14", + "log 0.4.16", "thiserror", ] @@ -1716,7 +1716,7 @@ dependencies = [ "hex", "kuska-handshake", "kuska-sodiumoxide", - "log 0.4.14", + "log 0.4.16", "once_cell", "regex", "serde 1.0.136", @@ -1730,7 +1730,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" dependencies = [ - "log 0.4.14", + "log 0.4.16", ] [[package]] @@ -1753,9 +1753,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.119" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libsodium-sys" @@ -1819,10 +1819,11 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg 1.1.0", "scopeguard 1.1.0", ] @@ -1832,14 +1833,14 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.14", + "log 0.4.16", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", "value-bag", @@ -1867,9 +1868,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "423430ac467408136d7de93f2929debd8a7bc3e795c92476f45e259b158e3355" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -1920,13 +1921,13 @@ dependencies = [ [[package]] name = "mini-internal" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9cec2df85e49afd5bd4c4afb21678e2177736ebe31e4b8836b821ffd806bd" +checksum = "60bbf2d78a45808eba478a0660f050bbce70dafc011e275cf00f6f8500a8be88" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -1937,9 +1938,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniserde" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4f376d897db27bdf4e318542322eca8fd41839cc56a12cc8f8d8a05b4386af" +checksum = "a89fcaf0064d3361240ae91a1f773d874302a62b4e6fdbd37b2888cb7d5aba3e" dependencies = [ "itoa 1.0.1", "mini-internal", @@ -1968,23 +1969,24 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.14", + "log 0.4.16", "miow 0.2.2", "net2", - "slab 0.4.5", + "slab 0.4.6", "winapi 0.2.8", ] [[package]] name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", - "log 0.4.14", + "log 0.4.16", "miow 0.3.7", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -1995,9 +1997,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", - "log 0.4.14", + "log 0.4.16", "mio 0.6.23", - "slab 0.4.5", + "slab 0.4.6", ] [[package]] @@ -2046,7 +2048,7 @@ checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" dependencies = [ "buf_redux", "httparse", - "log 0.4.14", + "log 0.4.16", "mime", "mime_guess", "quick-error", @@ -2086,7 +2088,7 @@ dependencies = [ "atomicwrites", "indexmap", "lazy_static", - "log 0.4.14", + "log 0.4.16", "mkdirp", "objekt", "serde-hjson", @@ -2182,13 +2184,12 @@ dependencies = [ [[package]] name = "nom" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", "minimal-lexical", - "version_check 0.9.4", ] [[package]] @@ -2240,9 +2241,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" dependencies = [ "libc", ] @@ -2317,7 +2318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.6", + "lock_api 0.4.7", "parking_lot_core 0.8.5", ] @@ -2358,7 +2359,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.11", + "redox_syscall 0.2.13", "smallvec 1.8.0", "winapi 0.3.9", ] @@ -2374,7 +2375,7 @@ dependencies = [ "jsonrpc-pubsub 11.0.0", "jsonrpc-test 11.0.0", "jsonrpc-ws-server", - "log 0.4.14", + "log 0.4.16", "snafu 0.4.4", ] @@ -2385,7 +2386,7 @@ dependencies = [ "clap", "env_logger 0.6.2", "lazy_static", - "log 0.4.14", + "log 0.4.16", "peach-lib", "regex", "rpassword", @@ -2400,7 +2401,7 @@ name = "peach-dyndns-updater" version = "0.1.8" dependencies = [ "env_logger 0.6.2", - "log 0.4.14", + "log 0.4.16", "peach-lib", ] @@ -2412,7 +2413,7 @@ dependencies = [ "jsonrpc-core 18.0.0", "jsonrpc-http-server 18.0.0", "jsonrpc-test 18.0.0", - "log 0.4.14", + "log 0.4.16", "peach-stats", "serde_json", ] @@ -2429,7 +2430,7 @@ dependencies = [ "jsonrpc-client-core", "jsonrpc-client-http", "jsonrpc-core 8.0.1", - "log 0.4.14", + "log 0.4.16", "nanorand", "regex", "serde 1.0.136", @@ -2449,7 +2450,7 @@ dependencies = [ "jsonrpc-client-core", "jsonrpc-client-http", "jsonrpc-http-server 11.0.0", - "log 0.4.14", + "log 0.4.16", "peach-lib", "serde 1.0.136", "serde_json", @@ -2490,7 +2491,7 @@ dependencies = [ "jsonrpc-http-server 18.0.0", "jsonrpc-test 18.0.0", "linux-embedded-hal", - "log 0.4.14", + "log 0.4.16", "nix 0.11.1", "serde 1.0.136", "ssd1306", @@ -2501,7 +2502,7 @@ dependencies = [ name = "peach-stats" version = "0.3.0" dependencies = [ - "log 0.4.14", + "log 0.4.16", "miniserde", "probes 0.4.1", "serde 1.0.136", @@ -2520,7 +2521,7 @@ dependencies = [ "futures 0.3.21", "golgi", "lazy_static", - "log 0.4.14", + "log 0.4.16", "maud", "peach-lib", "rouille", @@ -2554,9 +2555,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "polling" @@ -2566,7 +2567,7 @@ checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" dependencies = [ "cfg-if 1.0.0", "libc", - "log 0.4.14", + "log 0.4.16", "wepoll-ffi", "winapi 0.3.9", ] @@ -2584,7 +2585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f77e66f6d6d898cbbd4a09c48fd3507cfc210b7c83055de02a38b5f7a1e6d216" dependencies = [ "libc", - "time 0.3.7", + "time 0.3.9", ] [[package]] @@ -2594,7 +2595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bb02a28631f195f482c19529ec82bec8e4ffa2d96159e67eb1ae9f5c5c902d8" dependencies = [ "libc", - "time 0.1.44", + "time 0.1.43", ] [[package]] @@ -2604,9 +2605,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", "version_check 0.9.4", ] @@ -2616,8 +2617,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", + "proc-macro2 1.0.37", + "quote 1.0.17", "version_check 0.9.4", ] @@ -2632,9 +2633,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid 0.2.2", ] @@ -2656,11 +2657,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.37", ] [[package]] @@ -2789,7 +2790,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", ] [[package]] @@ -2886,21 +2887,22 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.5", - "redox_syscall 0.2.11", + "getrandom 0.2.6", + "redox_syscall 0.2.13", + "thiserror", ] [[package]] @@ -2956,7 +2958,7 @@ dependencies = [ "serde_json", "sha1", "threadpool", - "time 0.3.7", + "time 0.3.9", "tiny_http", "url 2.2.2", ] @@ -3001,7 +3003,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.6", + "semver 1.0.7", ] [[package]] @@ -3060,9 +3062,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" [[package]] name = "semver-parser" @@ -3104,9 +3106,9 @@ version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -3217,9 +3219,9 @@ checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" @@ -3301,9 +3303,9 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -3377,9 +3379,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -3395,12 +3397,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.86" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", + "proc-macro2 1.0.37", + "quote 1.0.17", "unicode-xid 0.2.2", ] @@ -3410,9 +3412,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", "unicode-xid 0.2.2", ] @@ -3435,7 +3437,7 @@ dependencies = [ "chrono", "lazy_static", "libc", - "nom 7.1.0", + "nom 7.1.1", "winapi 0.3.9", ] @@ -3464,7 +3466,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.11", + "redox_syscall 0.2.13", "remove_dir_all", "winapi 0.3.9", ] @@ -3511,9 +3513,9 @@ version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", ] [[package]] @@ -3527,20 +3529,19 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] [[package]] name = "time" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ "libc", "num_threads", @@ -3555,7 +3556,7 @@ dependencies = [ "ascii", "chrono", "chunked_transfer", - "log 0.4.14", + "log 0.4.16", "url 2.2.2", ] @@ -3625,7 +3626,7 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.8.0", + "mio 0.8.2", "num_cpus", "pin-project-lite", "socket2", @@ -3663,7 +3664,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.31", "iovec", - "log 0.4.14", + "log 0.4.16", "mio 0.6.23", "scoped-tls", "tokio 0.1.22", @@ -3712,7 +3713,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "log 0.4.14", + "log 0.4.16", ] [[package]] @@ -3742,11 +3743,11 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", - "log 0.4.14", + "log 0.4.16", "mio 0.6.23", "num_cpus", "parking_lot 0.9.0", - "slab 0.4.5", + "slab 0.4.6", "tokio-executor", "tokio-io", "tokio-sync", @@ -3807,9 +3808,9 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", - "log 0.4.14", + "log 0.4.16", "num_cpus", - "slab 0.4.5", + "slab 0.4.6", "tokio-executor", ] @@ -3821,7 +3822,7 @@ checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", - "slab 0.4.5", + "slab 0.4.6", "tokio-executor", ] @@ -3833,7 +3834,7 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "log 0.4.14", + "log 0.4.16", "mio 0.6.23", "tokio-codec", "tokio-io", @@ -3850,7 +3851,7 @@ dependencies = [ "futures 0.1.31", "iovec", "libc", - "log 0.4.14", + "log 0.4.16", "mio 0.6.23", "mio-uds", "tokio-codec", @@ -3867,7 +3868,7 @@ dependencies = [ "bytes 1.1.0", "futures-core", "futures-sink", - "log 0.4.14", + "log 0.4.16", "pin-project-lite", "tokio 1.17.0", ] @@ -3890,9 +3891,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -3901,9 +3902,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" dependencies = [ "lazy_static", ] @@ -4064,7 +4065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" dependencies = [ "futures 0.1.31", - "log 0.4.14", + "log 0.4.16", "try-lock 0.1.0", ] @@ -4075,7 +4076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ "futures 0.1.31", - "log 0.4.14", + "log 0.4.16", "try-lock 0.2.3", ] @@ -4085,7 +4086,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.14", + "log 0.4.16", "try-lock 0.2.3", ] @@ -4097,9 +4098,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" @@ -4119,10 +4126,10 @@ checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.14", - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "log 0.4.16", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", "wasm-bindgen-shared", ] @@ -4144,7 +4151,7 @@ version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ - "quote 1.0.15", + "quote 1.0.17", "wasm-bindgen-macro-support", ] @@ -4154,9 +4161,9 @@ version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.15", - "syn 1.0.86", + "proc-macro2 1.0.37", + "quote 1.0.17", + "syn 1.0.91", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4235,7 +4242,7 @@ version = "0.3.1" source = "git+https://github.com/sauyon/wpa-ctrl-rs.git?branch=master#e37eeb0a9b58cde12bc9825515caaaadcbf49fa6" dependencies = [ "libc", - "log 0.4.14", + "log 0.4.16", ] [[package]] @@ -4247,12 +4254,12 @@ dependencies = [ "byteorder", "bytes 0.4.12", "httparse", - "log 0.4.14", + "log 0.4.16", "mio 0.6.23", "mio-extras", "rand 0.6.5", "sha-1", - "slab 0.4.5", + "slab 0.4.6", "url 1.7.2", ] From defb8f5f09bbf4a15416ad6aa746cabb81325b67 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 10:55:41 +0200 Subject: [PATCH 05/17] try to fix probes build issue again --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0ea6b81..964333e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2585,7 +2585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f77e66f6d6d898cbbd4a09c48fd3507cfc210b7c83055de02a38b5f7a1e6d216" dependencies = [ "libc", - "time 0.3.9", + "time 0.1.43", ] [[package]] From d31825f688c8a503f8573cc1da8c60b0d9f51403 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 11:13:31 +0200 Subject: [PATCH 06/17] add tests to ci and fail on clippy warnings --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1fbc454..60d1dda 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,8 @@ steps: image: rust:buster commands: - rustup component add clippy - - cargo clippy --verbose --all + - cargo clippy -- -D warnings + - cargo test trigger: event: From 271aa14322d4c7950dcb46c9893874bb7527164e Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 11:33:52 +0200 Subject: [PATCH 07/17] add build status badge to root readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fe97bcc..48fc690 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ _Better [Scuttlebutt](https://scuttlebutt.nz) cloud infrastructure as a hardware [**_Support us on OpenCollective!_**](https://opencollective.com/peachcloud) +[![Build Status](https://build.coopcloud.tech/api/badges/PeachCloud/peach-workspace/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/PeachCloud/peach-workspace) + ## Background - April 2018 project proposal: [`%HqwAsltORROCh4uyOq6iV+SsqU3OuNUevnq+5dwCqVI=.sha256`](https://viewer.scuttlebot.io/%25HqwAsltORROCh4uyOq6iV%2BSsqU3OuNUevnq%2B5dwCqVI%3D.sha256) @@ -56,4 +58,4 @@ _Better [Scuttlebutt](https://scuttlebutt.nz) cloud infrastructure as a hardware - [GitHub](https://github.com/peachcloud) - [Twitter](https://twitter.com/peachcloudorg) - [Email](mailto:peachcloudorg@gmail.com) -- [OpenCollective](https://opencollective.com/peachcloud) \ No newline at end of file +- [OpenCollective](https://opencollective.com/peachcloud) From da8d8f0ec3d2c77e09cd595a454805abb5c95b31 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 11:37:11 +0200 Subject: [PATCH 08/17] add rustfmt and cargo check to ci pipeline --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 60d1dda..5b7ffa1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,8 +8,10 @@ steps: - name: clippy image: rust:buster commands: - - rustup component add clippy + - rustup component add clippy rustfmt + - cargo fmt --check - cargo clippy -- -D warnings + - cargo check - cargo test trigger: From b158fba1473258bf21e82b23d0dff4271b2ab5d9 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 11:44:14 +0200 Subject: [PATCH 09/17] separate ci pipeline into discreet steps --- .drone.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5b7ffa1..439210e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,17 +1,31 @@ kind: pipeline +type: docker name: test-on-amd64 platform: arch: amd64 steps: +- name: rustfmt + image: rust:buster + commands: + - rustup component add rustfmt + - cargo fmt --check + - name: clippy image: rust:buster commands: - - rustup component add clippy rustfmt - - cargo fmt --check + - rustup component add clippy - cargo clippy -- -D warnings + +- name: check + image: rust:buster + commands: - cargo check + +- name: test + image: rust:buster + commands: - cargo test trigger: From c792aea2f606788ff7bc5ceb3da5db7a05d5c5f7 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 11:55:00 +0200 Subject: [PATCH 10/17] add build step and arm64 pipeline --- .drone.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.drone.yml b/.drone.yml index 439210e..6b61e41 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,6 +28,53 @@ steps: commands: - cargo test +- name: build + image: rust:buster + commands: + - cargo build + +trigger: + event: + include: + - push + - pull_request + +--- +kind: pipeline +type: docker +name: test-on-arm64 + +platform: + arch: arm64 + +steps: +- name: rustfmt + image: rust:buster + commands: + - rustup component add rustfmt + - cargo fmt --check + +- name: clippy + image: rust:buster + commands: + - rustup component add clippy + - cargo clippy -- -D warnings + +- name: check + image: rust:buster + commands: + - cargo check + +- name: test + image: rust:buster + commands: + - cargo test + +- name: build + image: rust:buster + commands: + - cargo build + trigger: event: include: From abde4ce1b46158054add4c493a449f874bb9ed17 Mon Sep 17 00:00:00 2001 From: glyph Date: Wed, 6 Apr 2022 12:07:45 +0200 Subject: [PATCH 11/17] only specify triggers once --- .drone.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6b61e41..8113ab5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,12 +33,6 @@ steps: commands: - cargo build -trigger: - event: - include: - - push - - pull_request - --- kind: pipeline type: docker From 4662b15ba328d4f2d21edd30752f501a8eab2e9f Mon Sep 17 00:00:00 2001 From: glyph Date: Thu, 7 Apr 2022 14:20:41 +0200 Subject: [PATCH 12/17] remove unnecessary to_owned --- peach-config/src/update.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/peach-config/src/update.rs b/peach-config/src/update.rs index 7b404d9..51398c1 100644 --- a/peach-config/src/update.rs +++ b/peach-config/src/update.rs @@ -47,8 +47,8 @@ pub fn update_microservices() -> Result<(), PeachConfigError> { cmd(&["apt-get", "update"])?; // filter out peach-config from list of services let services_to_update: Vec<&str> = SERVICES - .to_vec() - .into_iter() + .iter() + .copied() .filter(|&x| x != "peach-config") .collect(); From e4078bd1bad52e990f0543352e3e4d53da1b8f31 Mon Sep 17 00:00:00 2001 From: glyph Date: Fri, 15 Apr 2022 09:48:39 +0200 Subject: [PATCH 13/17] specify triggers twice --- .drone.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8113ab5..8350bd6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,6 +33,11 @@ steps: commands: - cargo build +trigger: + event: + - push + - pull_request + --- kind: pipeline type: docker @@ -71,6 +76,5 @@ steps: trigger: event: - include: - - push - - pull_request + - push + - pull_request From 126609a605697f9071d3104aac05f9f341e1d5bf Mon Sep 17 00:00:00 2001 From: glyph Date: Fri, 15 Apr 2022 10:16:55 +0200 Subject: [PATCH 14/17] try arm64 ci only --- .drone.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8350bd6..b81eecb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,46 +1,5 @@ kind: pipeline type: docker -name: test-on-amd64 - -platform: - arch: amd64 - -steps: -- name: rustfmt - image: rust:buster - commands: - - rustup component add rustfmt - - cargo fmt --check - -- name: clippy - image: rust:buster - commands: - - rustup component add clippy - - cargo clippy -- -D warnings - -- name: check - image: rust:buster - commands: - - cargo check - -- name: test - image: rust:buster - commands: - - cargo test - -- name: build - image: rust:buster - commands: - - cargo build - -trigger: - event: - - push - - pull_request - ---- -kind: pipeline -type: docker name: test-on-arm64 platform: @@ -59,11 +18,6 @@ steps: - rustup component add clippy - cargo clippy -- -D warnings -- name: check - image: rust:buster - commands: - - cargo check - - name: test image: rust:buster commands: From 00d33c2c69cbede8d588f8a4cb1160422e7006bd Mon Sep 17 00:00:00 2001 From: glyph Date: Fri, 15 Apr 2022 10:22:39 +0200 Subject: [PATCH 15/17] remove arm64 pipeline [CI SKIP] --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b81eecb..25bfec3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,9 @@ kind: pipeline type: docker -name: test-on-arm64 +name: test-on-amd64 platform: - arch: arm64 + arch: amd64 steps: - name: rustfmt From 5a95ade8b950463214d068f926c88cc841e5bd0b Mon Sep 17 00:00:00 2001 From: glyph Date: Fri, 15 Apr 2022 10:38:12 +0200 Subject: [PATCH 16/17] only run ci on pull request and add docs to readme [CI SKIP] --- .drone.yml | 1 - README.md | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 25bfec3..a3c6451 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,5 +30,4 @@ steps: trigger: event: - - push - pull_request diff --git a/README.md b/README.md index 48fc690..1dc1c78 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,17 @@ _Better [Scuttlebutt](https://scuttlebutt.nz) cloud infrastructure as a hardware - [peach-patterns](https://github.com/peachcloud/peach-patterns) - Pattern library for the PeachCloud UI design system - [peach-web](https://github.com/peachcloud/peach-web) - A web interface for monitoring and interacting with the PeachCloud device +## Continuous Integration + +[Drone CI](https://docs.drone.io/) is used to provide continuous integration for this workspace. The configuration file can be found in `.drone.yml` in the root of this repository. It is currently configured to run `cargo fmt`, `cargo clippy`, `cargo test` and `cargo build` on every `pull request` event. The pipeline runs on the AMD64 Debian Buster image from the official Rust Docker image repository. + +The status of the current and previous CI builds can be viewed via the [Drone CI Build UI](https://build.coopcloud.tech/PeachCloud/peach-workspace) (kindly hosted by Co-op Cloud). + +Adding `[CI SKIP]` to the end of a commit message results in the CI checks being skipped for the next event. For example: + +`git commit -m "update readme [CI SKIP]"` +`git push origin main` + ## Developer Diaries - [@ahdinosaur](https://github.com/ahdinosaur): `@6ilZq3kN0F+dXFHAPjAwMm87JEb/VdB+LC9eIMW3sa0=.ed25519` From 713c3da4ccd35f5cf0ea0adf0f76aa92308caaf9 Mon Sep 17 00:00:00 2001 From: glyph Date: Fri, 15 Apr 2022 11:08:55 +0200 Subject: [PATCH 17/17] fix formatting --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1dc1c78..229433a 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,10 @@ The status of the current and previous CI builds can be viewed via the [Drone CI Adding `[CI SKIP]` to the end of a commit message results in the CI checks being skipped for the next event. For example: -`git commit -m "update readme [CI SKIP]"` -`git push origin main` +``` +git commit -m "update readme [CI SKIP]" +git push origin main +``` ## Developer Diaries