From 744f51a258eb731189deb909f2e9f36fd4a87247 Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Fri, 15 Sep 2023 20:53:00 +0200 Subject: [PATCH 1/4] version: bump version --- Cargo.lock | 12 ++++++------ Cargo.toml | 12 ++++++------ README.md | 8 ++++---- packages/configuration/Cargo.toml | 4 ++-- packages/test-helpers/Cargo.toml | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b67a3434f..976e9b55d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3169,7 +3169,7 @@ dependencies = [ [[package]] name = "torrust-tracker" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" dependencies = [ "aquatic_udp_protocol", "async-trait", @@ -3215,7 +3215,7 @@ dependencies = [ [[package]] name = "torrust-tracker-configuration" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" dependencies = [ "config", "log", @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "torrust-tracker-contrib-bencode" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" dependencies = [ "criterion", "error-chain", @@ -3238,7 +3238,7 @@ dependencies = [ [[package]] name = "torrust-tracker-located-error" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" dependencies = [ "log", "thiserror", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "torrust-tracker-primitives" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" dependencies = [ "derive_more", "serde", @@ -3254,7 +3254,7 @@ dependencies = [ [[package]] name = "torrust-tracker-test-helpers" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" dependencies = [ "lazy_static", "rand", diff --git a/Cargo.toml b/Cargo.toml index 6a7471550..0cb119a19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ license-file = "COPYRIGHT" publish = true repository = "https://github.com/torrust/torrust-tracker" rust-version = "1.72" -version = "3.0.0-alpha.7-develop" +version = "3.0.0-alpha.8-develop" [dependencies] aquatic_udp_protocol = "0.8" @@ -56,10 +56,10 @@ serde_json = "1.0" serde_with = "3.2" thiserror = "1.0" tokio = { version = "1.29", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] } -torrust-tracker-configuration = { version = "3.0.0-alpha.7-develop", path = "packages/configuration" } -torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.7-develop", path = "contrib/bencode" } -torrust-tracker-located-error = { version = "3.0.0-alpha.7-develop", path = "packages/located-error" } -torrust-tracker-primitives = { version = "3.0.0-alpha.7-develop", path = "packages/primitives" } +torrust-tracker-configuration = { version = "3.0.0-alpha.8-develop", path = "packages/configuration" } +torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.8-develop", path = "contrib/bencode" } +torrust-tracker-located-error = { version = "3.0.0-alpha.8-develop", path = "packages/located-error" } +torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "packages/primitives" } tower-http = { version = "0.4", features = ["compression-full"] } uuid = { version = "1", features = ["v4"] } @@ -70,7 +70,7 @@ reqwest = { version = "0.11.18", features = ["json"] } serde_bytes = "0.11" serde_repr = "0.1" serde_urlencoded = "0.7" -torrust-tracker-test-helpers = { version = "3.0.0-alpha.7-develop", path = "packages/test-helpers" } +torrust-tracker-test-helpers = { version = "3.0.0-alpha.8-develop", path = "packages/test-helpers" } [workspace] members = ["contrib/bencode", "packages/configuration", "packages/located-error", "packages/primitives", "packages/test-helpers"] diff --git a/README.md b/README.md index e8f54bb6e..b5805446a 100644 --- a/README.md +++ b/README.md @@ -179,13 +179,13 @@ This project was a joint effort by [Nautilus Cyberneering GmbH][nautilus] and [D [containers.md]: ./docs/containers.md -[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.7-develop/torrust_tracker/servers/apis/v1 -[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.7-develop/torrust_tracker/servers/http -[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.7-develop/torrust_tracker/servers/udp +[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/apis/v1 +[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/http +[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/udp [good first issues]: https://github.com/torrust/torrust-tracker/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22 [documentation]: https://docs.rs/torrust-tracker/ -[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.7-develop/torrust_tracker/servers/apis/v1 +[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/apis/v1 [discussions]: https://github.com/torrust/torrust-tracker/discussions [COPYRIGHT]: ./COPYRIGHT diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml index 9057e85df..631362c07 100644 --- a/packages/configuration/Cargo.toml +++ b/packages/configuration/Cargo.toml @@ -21,8 +21,8 @@ serde = { version = "1.0", features = ["derive"] } serde_with = "3.2" thiserror = "1.0" toml = "0.8" -torrust-tracker-located-error = { version = "3.0.0-alpha.7-develop", path = "../located-error" } -torrust-tracker-primitives = { version = "3.0.0-alpha.7-develop", path = "../primitives" } +torrust-tracker-located-error = { version = "3.0.0-alpha.8-develop", path = "../located-error" } +torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "../primitives" } [dev-dependencies] uuid = { version = "1", features = ["v4"] } diff --git a/packages/test-helpers/Cargo.toml b/packages/test-helpers/Cargo.toml index 49903213d..0c85d31f6 100644 --- a/packages/test-helpers/Cargo.toml +++ b/packages/test-helpers/Cargo.toml @@ -17,5 +17,5 @@ version.workspace = true [dependencies] lazy_static = "1.4" rand = "0.8.5" -torrust-tracker-configuration = { version = "3.0.0-alpha.7-develop", path = "../configuration" } -torrust-tracker-primitives = { version = "3.0.0-alpha.7-develop", path = "../primitives" } +torrust-tracker-configuration = { version = "3.0.0-alpha.8-develop", path = "../configuration" } +torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "../primitives" } From aafe394f3313eb1f23137fe66b6492485d125366 Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Fri, 15 Sep 2023 20:55:01 +0200 Subject: [PATCH 2/4] ci: fix deploymment workflow --- .github/workflows/deployment.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index 43bfe4784..ec349bf28 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -64,11 +64,10 @@ jobs: with: toolchain: stable - env: - CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - - id: publish name: Publish Crates + env: + CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}" run: | cargo publish -p torrust-tracker-contrib-bencode cargo publish -p torrust-tracker-located-error From 4f4d1369889be18070b6509bcfc7c1f90ad4f6a8 Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Fri, 15 Sep 2023 20:57:38 +0200 Subject: [PATCH 3/4] docs: small style update to release process --- docs/release_process.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/release_process.md b/docs/release_process.md index 4b58d7ca8..e29836191 100644 --- a/docs/release_process.md +++ b/docs/release_process.md @@ -13,12 +13,12 @@ Torrust Tracker is published according to this protocol: - [ ] `develop` is ready for branching for a release. - [ ] force-push develop to `staging` branch. -- [ ] commit `release: version (semantic version)`, removing the `-develop` suffix. +- [ ] commit `release: version (semantic version)`, that removes the `-develop` suffix. - [ ] create pull request to merge `staging` into `main` branch. - [ ] check all status checks succeed for `main` branch. -- [ ] push `main` branch to `releases\v(semantic version)` branch. -- [ ] check all status checks success for `releases\v(semantic version)` branch. -- [ ] create signed `v(semantic version)` tag from `releases\v(semantic version) HEAD`. +- [ ] push `main` branch to `releases/(semantic version)` branch. +- [ ] check all status checks success for `releases/(semantic version)` branch. +- [ ] create signed `v(semantic version)` tag from `releases/(semantic version) HEAD`. - [ ] create github release from `v(semantic version)` tag. - [ ] merge the `main` branch back into `develop` branch, assuring that the (semantic version) has the suffix `-develop`. From 98261eabd67f7f835469d9eeb983e4cf80c7f2a7 Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Fri, 15 Sep 2023 21:22:06 +0200 Subject: [PATCH 4/4] release: version 3.0.0-alpha.8 --- Cargo.lock | 12 ++++++------ Cargo.toml | 12 ++++++------ README.md | 8 ++++---- packages/configuration/Cargo.toml | 4 ++-- packages/test-helpers/Cargo.toml | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 976e9b55d..3c8169f50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3169,7 +3169,7 @@ dependencies = [ [[package]] name = "torrust-tracker" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" dependencies = [ "aquatic_udp_protocol", "async-trait", @@ -3215,7 +3215,7 @@ dependencies = [ [[package]] name = "torrust-tracker-configuration" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" dependencies = [ "config", "log", @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "torrust-tracker-contrib-bencode" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" dependencies = [ "criterion", "error-chain", @@ -3238,7 +3238,7 @@ dependencies = [ [[package]] name = "torrust-tracker-located-error" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" dependencies = [ "log", "thiserror", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "torrust-tracker-primitives" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" dependencies = [ "derive_more", "serde", @@ -3254,7 +3254,7 @@ dependencies = [ [[package]] name = "torrust-tracker-test-helpers" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" dependencies = [ "lazy_static", "rand", diff --git a/Cargo.toml b/Cargo.toml index 0cb119a19..f5ab5187c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ license-file = "COPYRIGHT" publish = true repository = "https://github.com/torrust/torrust-tracker" rust-version = "1.72" -version = "3.0.0-alpha.8-develop" +version = "3.0.0-alpha.8" [dependencies] aquatic_udp_protocol = "0.8" @@ -56,10 +56,10 @@ serde_json = "1.0" serde_with = "3.2" thiserror = "1.0" tokio = { version = "1.29", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] } -torrust-tracker-configuration = { version = "3.0.0-alpha.8-develop", path = "packages/configuration" } -torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.8-develop", path = "contrib/bencode" } -torrust-tracker-located-error = { version = "3.0.0-alpha.8-develop", path = "packages/located-error" } -torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "packages/primitives" } +torrust-tracker-configuration = { version = "3.0.0-alpha.8", path = "packages/configuration" } +torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.8", path = "contrib/bencode" } +torrust-tracker-located-error = { version = "3.0.0-alpha.8", path = "packages/located-error" } +torrust-tracker-primitives = { version = "3.0.0-alpha.8", path = "packages/primitives" } tower-http = { version = "0.4", features = ["compression-full"] } uuid = { version = "1", features = ["v4"] } @@ -70,7 +70,7 @@ reqwest = { version = "0.11.18", features = ["json"] } serde_bytes = "0.11" serde_repr = "0.1" serde_urlencoded = "0.7" -torrust-tracker-test-helpers = { version = "3.0.0-alpha.8-develop", path = "packages/test-helpers" } +torrust-tracker-test-helpers = { version = "3.0.0-alpha.8", path = "packages/test-helpers" } [workspace] members = ["contrib/bencode", "packages/configuration", "packages/located-error", "packages/primitives", "packages/test-helpers"] diff --git a/README.md b/README.md index b5805446a..b34168110 100644 --- a/README.md +++ b/README.md @@ -179,13 +179,13 @@ This project was a joint effort by [Nautilus Cyberneering GmbH][nautilus] and [D [containers.md]: ./docs/containers.md -[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/apis/v1 -[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/http -[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/udp +[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.8/torrust_tracker/servers/apis/v1 +[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.8/torrust_tracker/servers/http +[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.8/torrust_tracker/servers/udp [good first issues]: https://github.com/torrust/torrust-tracker/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22 [documentation]: https://docs.rs/torrust-tracker/ -[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/apis/v1 +[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.8/torrust_tracker/servers/apis/v1 [discussions]: https://github.com/torrust/torrust-tracker/discussions [COPYRIGHT]: ./COPYRIGHT diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml index 631362c07..53de593d2 100644 --- a/packages/configuration/Cargo.toml +++ b/packages/configuration/Cargo.toml @@ -21,8 +21,8 @@ serde = { version = "1.0", features = ["derive"] } serde_with = "3.2" thiserror = "1.0" toml = "0.8" -torrust-tracker-located-error = { version = "3.0.0-alpha.8-develop", path = "../located-error" } -torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "../primitives" } +torrust-tracker-located-error = { version = "3.0.0-alpha.8", path = "../located-error" } +torrust-tracker-primitives = { version = "3.0.0-alpha.8", path = "../primitives" } [dev-dependencies] uuid = { version = "1", features = ["v4"] } diff --git a/packages/test-helpers/Cargo.toml b/packages/test-helpers/Cargo.toml index 0c85d31f6..7dab50bad 100644 --- a/packages/test-helpers/Cargo.toml +++ b/packages/test-helpers/Cargo.toml @@ -17,5 +17,5 @@ version.workspace = true [dependencies] lazy_static = "1.4" rand = "0.8.5" -torrust-tracker-configuration = { version = "3.0.0-alpha.8-develop", path = "../configuration" } -torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "../primitives" } +torrust-tracker-configuration = { version = "3.0.0-alpha.8", path = "../configuration" } +torrust-tracker-primitives = { version = "3.0.0-alpha.8", path = "../primitives" }