From 96e044cf942b3bee2238e5f936a1d3b43ac8f501 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 8 Feb 2023 12:40:37 +0100 Subject: [PATCH] Import of v0.32.2 (#2083) --- CHANGES.md | 8 ++++++++ Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 8 ++++---- doc/Releasing.md | 18 +++++++++++++----- doc/Support.md | 5 +++++ marionette/Cargo.toml | 2 +- 6 files changed, 44 insertions(+), 23 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index cd9a17f..626ba37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,14 @@ All notable changes to this program are documented in this file. +## 0.32.2 (2023-02-08, `602aa16c20d4`) + +### Fixed + +- With the release of geckodriver 0.32.1 the marionette crate was inappropriately + bumped to a semver incompatible version and caused `cargo install geckodriver` + to fail for older releases. + ## 0.32.1 (2023-02-02, `b7f075124503`) ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 747195c..72aa12b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -336,7 +336,7 @@ dependencies = [ [[package]] name = "geckodriver" -version = "0.32.1" +version = "0.32.2" dependencies = [ "base64", "chrono", @@ -469,9 +469,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -606,9 +606,9 @@ dependencies = [ [[package]] name = "marionette" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4931207b28bedfb366ee0271840f2b259ef881ff817023be1ae0608759a18e33" +checksum = "38c1c2fa60208e240319aab7ec985220944e4d4a8920eb99f1855b6e6e6ab169" dependencies = [ "serde", "serde_json", @@ -639,9 +639,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e212582ede878b109755efd0773a4f0f4ec851584cf0aefbeb4d9ecc114822" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -792,9 +792,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -939,9 +939,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" dependencies = [ "itoa", "ryu", @@ -1141,9 +1141,9 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" diff --git a/Cargo.toml b/Cargo.toml index 1722aa7..3f7062b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2018" name = "geckodriver" -version = "0.32.1" +version = "0.32.2" authors = ["Mozilla"] include = [ "/.cargo", @@ -27,11 +27,11 @@ clap = { version = "~3.1", default-features = false, features = ["cargo", "std", hyper = "0.14" lazy_static = "1.0" log = { version = "0.4", features = ["std"] } -marionette = "0.2.1" +marionette = "0.3.0" mozdevice = "0.5.1" mozprofile = "0.9.1" -mozrunner = "0.15.0" -mozversion = "0.5.0" +mozrunner = "0.15.1" +mozversion = "0.5.1" regex = { version="1.0", default-features = false, features = ["perf", "std"] } serde = "1.0" serde_derive = "1.0" diff --git a/doc/Releasing.md b/doc/Releasing.md index 2419079..7089e39 100644 --- a/doc/Releasing.md +++ b/doc/Releasing.md @@ -45,23 +45,31 @@ you can skip them: For each crate: -1. Bump the version number in `Cargo.toml` based on [semantic versioning rules], +1. Change into the crates folder. +2. Bump the version number in `Cargo.toml` based on [semantic versioning rules], and also update the version dependency for other in-tree crates using the currently modified crate. Note that running `cargo update` (see next step) - will fail if you missed updating a crate's dependency. -2. Update the crate: `cargo update -p ` -3. We also publish audit information for the crates based on Mozilla's + will fail if you missed updating a crate's dependency. Also use the + [cargo-semver-checks] command to validate the version change: + + ```shell + % cargo semver-checks check-release + ``` + +3. Update the crate: `cargo update -p ` +4. We also publish audit information for the crates based on Mozilla's [audit criteria], and that must be updated for each release. To do that run: ```shell % ./mach cargo vet certify --force ``` -4. Commit the changes for the modified [Cargo.toml] files, [Cargo.lock] and the +5. Commit the changes for the modified [Cargo.toml] files, [Cargo.lock] and the [supply-chain/] folder, which can be found in the repositories root folder. Use a commit message like `Bug XYZ - [rust-] Release version `. [semantic versioning rules]: https://semver.org/ +[cargo-semver-checks]: https://crates.io/crates/cargo-semver-checks [audit criteria]: https://mozilla.github.io/cargo-vet/audit-criteria.html [Cargo.toml]: https://searchfox.org/mozilla-central/source/testing/geckodriver/Cargo.toml [Cargo.lock]: https://searchfox.org/mozilla-central/source/Cargo.lock diff --git a/doc/Support.md b/doc/Support.md index 023f0d2..5ff1890 100644 --- a/doc/Support.md +++ b/doc/Support.md @@ -22,6 +22,11 @@ and required versions of Selenium and Firefox: max + + 0.32.2 + ≥ 3.11 (3.14 Python) + 102 ESR + n/a 0.32.1 ≥ 3.11 (3.14 Python) diff --git a/marionette/Cargo.toml b/marionette/Cargo.toml index 22d5d1c..fbade53 100644 --- a/marionette/Cargo.toml +++ b/marionette/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marionette" -version = "0.2.1" +version = "0.3.0" authors = ["Mozilla"] description = "Library implementing the client side of Gecko's Marionette remote automation protocol." edition = "2018"