From 53ec7e7347fa538849fbe7faf95ac0daeb3af98f Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Wed, 1 May 2024 13:19:33 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=91=B7=20CI:=20Run=20`cargo`=20with?= =?UTF-8?q?=20`--locked`=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that we always use the same versions of dependencies. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f34621..4789882 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: toolchain: stable - uses: Swatinem/rust-cache@v2 - name: Run tests on stable Rust - run: cargo test + run: cargo --locked test test_nightly: env: @@ -41,7 +41,7 @@ jobs: toolchain: nightly - uses: Swatinem/rust-cache@v2 - name: Run tests on nightly Rust - run: cargo test + run: cargo --locked test fmt: runs-on: ubuntu-latest @@ -53,7 +53,7 @@ jobs: components: rustfmt - uses: Swatinem/rust-cache@v2 - name: Check formatting - run: cargo fmt --all -- --check + run: cargo --locked fmt --all -- --check clippy: runs-on: ubuntu-latest @@ -65,4 +65,4 @@ jobs: components: clippy - uses: Swatinem/rust-cache@v2 - name: Check common mistakes - run: cargo clippy --all -- -D warnings + run: cargo --locked clippy --all -- -D warnings From adb99e290ea1d435414d8c7a1254a469152c60c7 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Tue, 30 Apr 2024 22:06:25 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=8C=20Switch=20to=20latest=20zbus?= =?UTF-8?q?=20release:=204.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 28 +++++++++++++++++----------- Cargo.toml | 4 ++-- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0620fc5..501d2b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1951,8 +1951,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.1.2" -source = "git+https://github.com/dbus2/zbus/#a40b9257e72039d4716a37699b591edda13229c9" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aea58d1af0aaa8abf87f3d9ade9b8f46bf13727e5f9fb24bc31ee9d94a9b4ad" dependencies = [ "async-broadcast", "async-process", @@ -1983,8 +1984,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" -source = "git+https://github.com/dbus2/zbus/#a40b9257e72039d4716a37699b591edda13229c9" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf2b496ec1e2d3c4a7878e351607f7a2bec1e1029b353683dfc28a22999e369" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1996,7 +1998,8 @@ dependencies = [ [[package]] name = "zbus_names" version = "3.0.0" -source = "git+https://github.com/dbus2/zbus/#a40b9257e72039d4716a37699b591edda13229c9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -2005,8 +2008,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.2" -source = "git+https://github.com/dbus2/zbus/#a40b9257e72039d4716a37699b591edda13229c9" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e9282c6945d9e27742ba7ad7191325546636295de7b83f6735af73159b32ac7" dependencies = [ "endi", "enumflags2", @@ -2017,8 +2021,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" -source = "git+https://github.com/dbus2/zbus/#a40b9257e72039d4716a37699b591edda13229c9" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0142549e559746ff09d194dd43d256a554299d286cc56460a082b8ae24652aa1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2029,8 +2034,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.1.0" -source = "git+https://github.com/dbus2/zbus/#a40b9257e72039d4716a37699b591edda13229c9" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index c3523f7..b06f316 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,11 +20,11 @@ name = "busd" path = "src/bin/busd.rs" [dependencies] -zbus = { git = "https://github.com/dbus2/zbus/", features = [ +#zbus = { git = "https://github.com/dbus2/zbus/", features = [ +zbus = { version = "4.2.0", features = [ "tokio", "bus-impl", ], default-features = false } -#zbus = { version = "4", features = ["tokio", "bus-impl"], default-features = false } tokio = { version = "1.37.0", features = [ "macros", "rt-multi-thread", From 088a2cbc0eac91bf32a7c7a7864381bb1e43a042 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Tue, 30 Apr 2024 22:07:21 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=96=20Release=200.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 501d2b0..946d985 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,7 +349,7 @@ dependencies = [ [[package]] name = "busd" -version = "0.2.0" +version = "0.3.0" dependencies = [ "anyhow", "clap", diff --git a/Cargo.toml b/Cargo.toml index b06f316..bb57a4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "busd" -version = "0.2.0" +version = "0.3.0" authors = ["Zeeshan Ali Khan "] description = "A D-Bus bus (broker) implementation" edition = "2021"