From e3f69eb8021c740b3fbe60820e864d19c62f1243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Herbel?= Date: Sat, 14 Dec 2024 11:38:31 +0100 Subject: [PATCH 1/3] Incompatibly update dependencies --- Cargo.lock | 62 ++++++++++++++++++------------------------------------ Cargo.toml | 24 ++++++++++----------- 2 files changed, 33 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57a2a824..87324ce4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -203,9 +203,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -369,22 +369,22 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.29.6" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26948e37cfcb1f2c2cd38e0602d3a8ab6b9472c0c6eff4516fc8def9a3124d7" +checksum = "4613c3fa90ebf91dff72ff383a9324329c017819711bda86142be81368ac6fad" dependencies = [ "chrono", "log", "nu-ansi-term", "regex", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "fs4" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e871a4cfa68bb224863b53149d973df1ac8d1ed2fa1d1bfc37ac1bb65dd37207" +checksum = "c29c30684418547d476f0b48e84f4821639119c483b1eccd566c8cd0cd05f521" dependencies = [ "rustix", "windows-sys 0.52.0", @@ -504,9 +504,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libredox" @@ -781,7 +781,7 @@ dependencies = [ "sysinfo", "tar", "tempfile", - "thiserror 2.0.6", + "thiserror", "tokio", "tokio-util", "walkdir", @@ -831,18 +831,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -920,9 +920,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" +checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46" dependencies = [ "core-foundation-sys", "libc", @@ -964,38 +964,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" -dependencies = [ - "thiserror-impl 2.0.6", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 6738dec0..56f5d1d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,26 +6,26 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = { version = "1.0.93", features = ["backtrace"] } +anyhow = { version = "1.0.94", features = ["backtrace"] } base64 = "0.22.1" camino = { version = "1.1.9", features = ["serde1"] } -chrono = "0.4.38" -clap = { version = "4.5.21", features = ["derive"] } +chrono = "0.4.39" +clap = { version = "4.5.23", features = ["derive"] } ctrlc = { version = "3.4.5", features = ["termination"] } flate2 = "1.0.35" -flexi_logger = "0.29.6" -fs4 = "0.11.1" -libc = "0.2.162" +flexi_logger = "0.29.7" +fs4 = "0.12.0" +libc = "0.2.168" log = "0.4.22" nix = { version = "0.29.0", features = ["signal"] } -serde = { version = "1.0.215", features = ["derive"] } -serde_json = "1.0.132" -sysinfo = "0.32.0" +serde = { version = "1.0.216", features = ["derive"] } +serde_json = "1.0.133" +sysinfo = "0.33.0" tar = "0.4.43" tempfile = "3.14.0" -thiserror = "2.0.3" -tokio = { version = "1.41.1", features = ["full"] } -tokio-util = { version = "0.7.12", features = ["full"] } +thiserror = "2.0.7" +tokio = { version = "1.42.0", features = ["full"] } +tokio-util = { version = "0.7.13", features = ["full"] } walkdir = "2.5.0" winsafe = { version = "0.0.22", features = [ "ole" ] } [dependencies.windows] From 5e7c56ee2e86285feb9da2a60d8141612cfad551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Herbel?= Date: Sat, 14 Dec 2024 11:41:25 +0100 Subject: [PATCH 2/3] Include RCC binaries for MacOS in release page Robotmk is not supported for MacOS via the Checkmk agent bakery, but customers can of course use the binaries for development on MacOS. --- .github/workflows/release.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d5392995..677820dc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -41,6 +41,8 @@ jobs: cp artifact/rcc/linux64/rccremote artifact/rcc/rccremote_linux64 cp artifact/rcc/windows64/rcc.exe artifact/rcc/rcc_windows64.exe cp artifact/rcc/windows64/rccremote.exe artifact/rcc/rccremote_windows64.exe + cp artifact/rcc/macos64/rcc artifact/rcc/rcc_macos64 + cp artifact/rcc/macos64/rccremote artifact/rcc/rccremote_macos64 - name: "Compute release tag" id: compute-tag @@ -67,7 +69,9 @@ jobs: artifact/rcc/rcc_linux64, artifact/rcc/rccremote_linux64, artifact/rcc/rcc_windows64.exe, - artifact/rcc/rccremote_windows64.exe + artifact/rcc/rccremote_windows64.exe, + artifact/rcc/rcc_macos64, + artifact/rcc/rccremote_macos64 replacesArtifacts: true removeArtifacts: true prerelease: true From 08307dd66145af9f418cd30a29b5050ba823eec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Herbel?= Date: Sat, 14 Dec 2024 11:42:57 +0100 Subject: [PATCH 3/3] Bump version to 3.0.0-alpha-15 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87324ce4..a65af500 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -761,7 +761,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "robotmk" -version = "3.0.0-alpha-14" +version = "3.0.0-alpha-15" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index 56f5d1d5..9494773c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "robotmk" -version = "3.0.0-alpha-14" +version = "3.0.0-alpha-15" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html