From 8248f95c49883c73410cbd2467785cd2b63300d8 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 16 Jul 2024 09:54:54 -0700 Subject: [PATCH 1/2] chore: Release --- wayland-backend/CHANGELOG.md | 2 ++ wayland-backend/Cargo.toml | 4 ++-- wayland-client/Cargo.toml | 6 +++--- wayland-cursor/Cargo.toml | 4 ++-- wayland-egl/Cargo.toml | 6 +++--- wayland-protocols-misc/Cargo.toml | 12 ++++++------ wayland-protocols-plasma/Cargo.toml | 12 ++++++------ wayland-protocols-wlr/Cargo.toml | 12 ++++++------ wayland-protocols/Cargo.toml | 10 +++++----- wayland-scanner/Cargo.toml | 2 +- wayland-server/Cargo.toml | 6 +++--- wayland-sys/Cargo.toml | 2 +- wayland-tests/Cargo.toml | 2 +- 13 files changed, 41 insertions(+), 39 deletions(-) diff --git a/wayland-backend/CHANGELOG.md b/wayland-backend/CHANGELOG.md index 290e7e3322b..6715846fc63 100644 --- a/wayland-backend/CHANGELOG.md +++ b/wayland-backend/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.3.6 -- 2024-07-16 + ### Bugfixes - backend/rs: server: Fixed potential deadlock on object destruction diff --git a/wayland-backend/Cargo.toml b/wayland-backend/Cargo.toml index 742261a0114..1c71719b1da 100644 --- a/wayland-backend/Cargo.toml +++ b/wayland-backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-backend" -version = "0.3.5" +version = "0.3.6" authors = ["Elinor Berger "] edition = "2021" rust-version = "1.65" @@ -14,7 +14,7 @@ readme = "README.md" build = "build.rs" [dependencies] -wayland-sys = { version = "0.31.3", path = "../wayland-sys", features = [] } +wayland-sys = { version = "0.31.4", path = "../wayland-sys", features = [] } log = { version = "0.4", optional = true } scoped-tls = "1.0" downcast-rs = "1.2" diff --git a/wayland-client/Cargo.toml b/wayland-client/Cargo.toml index 75eb8609709..3f7ab6f0b99 100644 --- a/wayland-client/Cargo.toml +++ b/wayland-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-client" -version = "0.31.4" +version = "0.31.5" documentation = "https://docs.rs/wayland-client/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -13,8 +13,8 @@ description = "Bindings to the standard C implementation of the wayland protocol readme = "README.md" [dependencies] -wayland-backend = { version = "0.3.5", path = "../wayland-backend" } -wayland-scanner = { version = "0.31.3", path = "../wayland-scanner" } +wayland-backend = { version = "0.3.6", path = "../wayland-backend" } +wayland-scanner = { version = "0.31.4", path = "../wayland-scanner" } bitflags = "2" rustix = { version = "0.38.0", features = ["event"] } log = { version = "0.4", optional = true } diff --git a/wayland-cursor/Cargo.toml b/wayland-cursor/Cargo.toml index 96459efec27..e940223d4fe 100644 --- a/wayland-cursor/Cargo.toml +++ b/wayland-cursor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-cursor" -version = "0.31.4" +version = "0.31.5" documentation = "https://docs.rs/wayland-cursor/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -13,7 +13,7 @@ description = "Bindings to libwayland-cursor." readme = "README.md" [dependencies] -wayland-client = { version = "0.31.4", path = "../wayland-client" } +wayland-client = { version = "0.31.5", path = "../wayland-client" } xcursor = "0.3.1" rustix = { version = "0.38.15", features = ["shm"] } diff --git a/wayland-egl/Cargo.toml b/wayland-egl/Cargo.toml index fe7abb8de73..1c129502798 100644 --- a/wayland-egl/Cargo.toml +++ b/wayland-egl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-egl" -version = "0.32.2" +version = "0.32.3" documentation = "https://docs.rs/wayland-egl/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -13,8 +13,8 @@ description = "Bindings to libwayland-egl." readme = "README.md" [dependencies] -wayland-backend = { version = "0.3.5", path = "../wayland-backend", features = ["client_system"] } -wayland-sys = { version = "0.31.3", path="../wayland-sys", features = ["egl"] } +wayland-backend = { version = "0.3.6", path = "../wayland-backend", features = ["client_system"] } +wayland-sys = { version = "0.31.4", path="../wayland-sys", features = ["egl"] } [package.metadata.docs.rs] all-features = true diff --git a/wayland-protocols-misc/Cargo.toml b/wayland-protocols-misc/Cargo.toml index e579ed3ff8c..bd711d01924 100644 --- a/wayland-protocols-misc/Cargo.toml +++ b/wayland-protocols-misc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-protocols-misc" -version = "0.3.2" +version = "0.3.3" documentation = "https://docs.rs/wayland-protocols-misc/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -15,11 +15,11 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -wayland-scanner = { version = "0.31.3", path = "../wayland-scanner" } -wayland-backend = { version = "0.3.5", path = "../wayland-backend" } -wayland-client = { version = "0.31.4", path = "../wayland-client", optional = true } -wayland-server = { version = "0.31.3", path = "../wayland-server", optional = true } -wayland-protocols = { version = "0.32.2", path = "../wayland-protocols", features=["unstable"] } +wayland-scanner = { version = "0.31.4", path = "../wayland-scanner" } +wayland-backend = { version = "0.3.6", path = "../wayland-backend" } +wayland-client = { version = "0.31.5", path = "../wayland-client", optional = true } +wayland-server = { version = "0.31.4", path = "../wayland-server", optional = true } +wayland-protocols = { version = "0.32.3", path = "../wayland-protocols", features=["unstable"] } bitflags = "2" [features] diff --git a/wayland-protocols-plasma/Cargo.toml b/wayland-protocols-plasma/Cargo.toml index d92ea522363..60d39a6add6 100644 --- a/wayland-protocols-plasma/Cargo.toml +++ b/wayland-protocols-plasma/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-protocols-plasma" -version = "0.3.2" +version = "0.3.3" documentation = "https://docs.rs/wayland-protocols-plasma/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -15,11 +15,11 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -wayland-scanner = { version = "0.31.3", path = "../wayland-scanner" } -wayland-backend = { version = "0.3.5", path = "../wayland-backend" } -wayland-client = { version = "0.31.4", path = "../wayland-client", optional = true } -wayland-server = { version = "0.31.3", path = "../wayland-server", optional = true } -wayland-protocols = { version = "0.32.2", path = "../wayland-protocols"} +wayland-scanner = { version = "0.31.4", path = "../wayland-scanner" } +wayland-backend = { version = "0.3.6", path = "../wayland-backend" } +wayland-client = { version = "0.31.5", path = "../wayland-client", optional = true } +wayland-server = { version = "0.31.4", path = "../wayland-server", optional = true } +wayland-protocols = { version = "0.32.3", path = "../wayland-protocols"} bitflags = "2" [features] diff --git a/wayland-protocols-wlr/Cargo.toml b/wayland-protocols-wlr/Cargo.toml index 9b4361b7ecf..8e746f51e55 100644 --- a/wayland-protocols-wlr/Cargo.toml +++ b/wayland-protocols-wlr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-protocols-wlr" -version = "0.3.2" +version = "0.3.3" documentation = "https://docs.rs/wayland-protocols-wlr/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -15,11 +15,11 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -wayland-scanner = { version = "0.31.3", path = "../wayland-scanner" } -wayland-backend = { version = "0.3.5", path = "../wayland-backend" } -wayland-client = { version = "0.31.4", path = "../wayland-client", optional = true } -wayland-server = { version = "0.31.3", path = "../wayland-server", optional = true } -wayland-protocols = { version = "0.32.2", path = "../wayland-protocols"} +wayland-scanner = { version = "0.31.4", path = "../wayland-scanner" } +wayland-backend = { version = "0.3.6", path = "../wayland-backend" } +wayland-client = { version = "0.31.5", path = "../wayland-client", optional = true } +wayland-server = { version = "0.31.4", path = "../wayland-server", optional = true } +wayland-protocols = { version = "0.32.3", path = "../wayland-protocols"} bitflags = "2" [features] diff --git a/wayland-protocols/Cargo.toml b/wayland-protocols/Cargo.toml index 56590de0026..ccc4c90c760 100644 --- a/wayland-protocols/Cargo.toml +++ b/wayland-protocols/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-protocols" -version = "0.32.2" +version = "0.32.3" documentation = "https://docs.rs/wayland-protocols/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -13,10 +13,10 @@ rust-version = "1.65" readme = "README.md" [dependencies] -wayland-scanner = { version = "0.31.3", path = "../wayland-scanner" } -wayland-backend = { version = "0.3.5", path = "../wayland-backend" } -wayland-client = { version = "0.31.4", path = "../wayland-client", optional = true } -wayland-server = { version = "0.31.3", path = "../wayland-server", optional = true } +wayland-scanner = { version = "0.31.4", path = "../wayland-scanner" } +wayland-backend = { version = "0.3.6", path = "../wayland-backend" } +wayland-client = { version = "0.31.5", path = "../wayland-client", optional = true } +wayland-server = { version = "0.31.4", path = "../wayland-server", optional = true } bitflags = "2" [features] diff --git a/wayland-scanner/Cargo.toml b/wayland-scanner/Cargo.toml index 79d74502885..e30700c243b 100644 --- a/wayland-scanner/Cargo.toml +++ b/wayland-scanner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-scanner" -version = "0.31.3" +version = "0.31.4" authors = ["Elinor Berger "] repository = "https://github.com/smithay/wayland-rs" documentation = "https://docs.rs/wayland-scanner/" diff --git a/wayland-server/Cargo.toml b/wayland-server/Cargo.toml index 6f5d5d4b68b..18faa39a93b 100644 --- a/wayland-server/Cargo.toml +++ b/wayland-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-server" -version = "0.31.3" +version = "0.31.4" documentation = "https://docs.rs/wayland-server/" repository = "https://github.com/smithay/wayland-rs" authors = ["Elinor Berger "] @@ -13,8 +13,8 @@ rust-version = "1.65" readme = "README.md" [dependencies] -wayland-backend = { version = "0.3.5", path = "../wayland-backend" } -wayland-scanner = { version = "0.31.3", path = "../wayland-scanner" } +wayland-backend = { version = "0.3.6", path = "../wayland-backend" } +wayland-scanner = { version = "0.31.4", path = "../wayland-scanner" } bitflags = "2" log = { version = "0.4", optional = true } downcast-rs = "1.2" diff --git a/wayland-sys/Cargo.toml b/wayland-sys/Cargo.toml index 3580a9443a9..4205d45afc4 100644 --- a/wayland-sys/Cargo.toml +++ b/wayland-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-sys" -version = "0.31.3" +version = "0.31.4" repository = "https://github.com/smithay/wayland-rs" documentation = "https://docs.rs/wayland-sys/" authors = ["Elinor Berger "] diff --git a/wayland-tests/Cargo.toml b/wayland-tests/Cargo.toml index 679821973ba..58c98227776 100644 --- a/wayland-tests/Cargo.toml +++ b/wayland-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wayland-tests" -version = "0.1.1" +version = "0.1.2" edition = "2021" rust-version = "1.65" publish = false From 9cb9f772b6defc06f365f4b9020891f86f1cca04 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 16 Jul 2024 09:56:10 -0700 Subject: [PATCH 2/2] Add a `RELEASING.md` file Want to make sure the release process is documented somewhere. --- RELEASING.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELEASING.md diff --git a/RELEASING.md b/RELEASING.md new file mode 100644 index 00000000000..e9aaf1de58e --- /dev/null +++ b/RELEASING.md @@ -0,0 +1,15 @@ +Release Process +=============== + +Wayland-rs has a CI automation for releasing all the subcrates on crates.io when a release is +tagged. After updating the changelogs and versions. + +* Create a branch for the release +* `cargo release` (install with `cargo install cargo-release`) can be used to bump versions + - For instance, `cargo release --no-publish --no-tag --no-push --execute patch` +* Amend the commit to update the changelogs of any subcrates with changelog entries to have a release + date. +* Create a pull request with the release. Check that there are no warnings from `publish` CI job + - Those will become hard errors when a release is tagged +* Merge PR, and tag as `release-YYYY-MM-DD`, with the current date +* When the tag is pushed, CI will run and release to crates.io