Skip to content

Commit 1e9f5b5

Browse files
da2ce7da2ce7
committed
Merge #452: Prepare for Release of 3.0.0-alpha.10
fc610f6 develop: bump version 3.0.0-alpha.10-develop (Cameron Garnham) dba065f docs: minor changes to release process (Cameron Garnham) cea471f ci: fix test in container workflow (Cameron Garnham) Pull request description: closes #447 ACKs for top commit: da2ce7: ACK fc610f6 Tree-SHA512: ed2e5b14a86f20e817d13338e74e5dad6f2f0c4120bf0242727afd4e0b8e87e8b0e9bf2924984f535721bb6143efae875dd8332d8510c427366deb3de9a316be
2 parents 8483347 + fc610f6 commit 1e9f5b5

7 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎.github/workflows/container.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
echo "continue=true" >> $GITHUB_OUTPUT
8181
echo "On \`develop\` Branch, Type: \`development\`"
8282
83-
elif [[ "${{ github.ref }}" =~ ^(refs\/heads\/releases\/)(v)(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ ]]; then
83+
elif [[ $(echo "${{ github.ref }}" | grep -P '^(refs\/heads\/releases\/)(v)(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$') ]]; then
8484
8585
version=$(echo "${{ github.ref }}" | sed -n -E 's/^(refs\/heads\/releases\/)//p')
8686
echo "version=$version" >> $GITHUB_OUTPUT

‎Cargo.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ license-file = "COPYRIGHT"
2626
publish = true
2727
repository = "https://github.com/torrust/torrust-tracker"
2828
rust-version = "1.72"
29-
version = "3.0.0-alpha.9-develop"
29+
version = "3.0.0-alpha.10-develop"
3030

3131
[dependencies]
3232
aquatic_udp_protocol = "0.8"
@@ -56,10 +56,10 @@ serde_json = "1.0"
5656
serde_with = "3.2"
5757
thiserror = "1.0"
5858
tokio = { version = "1.29", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
59-
torrust-tracker-configuration = { version = "3.0.0-alpha.9-develop", path = "packages/configuration" }
60-
torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.9-develop", path = "contrib/bencode" }
61-
torrust-tracker-located-error = { version = "3.0.0-alpha.9-develop", path = "packages/located-error" }
62-
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "packages/primitives" }
59+
torrust-tracker-configuration = { version = "3.0.0-alpha.10-develop", path = "packages/configuration" }
60+
torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.10-develop", path = "contrib/bencode" }
61+
torrust-tracker-located-error = { version = "3.0.0-alpha.10-develop", path = "packages/located-error" }
62+
torrust-tracker-primitives = { version = "3.0.0-alpha.10-develop", path = "packages/primitives" }
6363
tower-http = { version = "0.4", features = ["compression-full"] }
6464
uuid = { version = "1", features = ["v4"] }
6565

@@ -70,7 +70,7 @@ reqwest = { version = "0.11.18", features = ["json"] }
7070
serde_bytes = "0.11"
7171
serde_repr = "0.1"
7272
serde_urlencoded = "0.7"
73-
torrust-tracker-test-helpers = { version = "3.0.0-alpha.9-develop", path = "packages/test-helpers" }
73+
torrust-tracker-test-helpers = { version = "3.0.0-alpha.10-develop", path = "packages/test-helpers" }
7474

7575
[workspace]
7676
members = ["contrib/bencode", "packages/configuration", "packages/located-error", "packages/primitives", "packages/test-helpers"]

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ This project was a joint effort by [Nautilus Cyberneering GmbH][nautilus] and [D
179179

180180
[containers.md]: ./docs/containers.md
181181

182-
[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-develop/torrust_tracker/servers/apis/v1
183-
[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-develop/torrust_tracker/servers/http
184-
[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-develop/torrust_tracker/servers/udp
182+
[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/apis/v1
183+
[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/http
184+
[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/udp
185185

186186
[good first issues]: https://github.com/torrust/torrust-tracker/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
187187
[documentation]: https://docs.rs/torrust-tracker/
188-
[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-develop/torrust_tracker/servers/apis/v1
188+
[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/apis/v1
189189
[discussions]: https://github.com/torrust/torrust-tracker/discussions
190190

191191
[COPYRIGHT]: ./COPYRIGHT

‎docs/release_process.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Torrust Tracker Release Process (v2.2.0)
1+
# Torrust Tracker Release Process (v2.2.1)
22

33
## Version:
44
> **The `[semantic version]` is bumped according to releases, new features, and breaking changes.**
@@ -29,6 +29,9 @@ git push torrust
2929
```
3030

3131
### 4. Create and Merge Pull Request from `staging/main` into `main` branch.
32+
33+
Pull request title format: "Release Version `[semantic version]`".
34+
3235
This pull request merges the new version into the `main` branch.
3336

3437
### 5. Push new version from `main` HEAD to `releases/v[semantic version]` branch:
@@ -70,6 +73,7 @@ git push torrust
7073
```
7174

7275
### 10. Create and Merge Pull Request from `staging/develop` into `develop` branch.
73-
This pull request merges the new release into the `develop` branch and bumps the version number.
7476

77+
Pull request title format: "Version `[semantic version]` was Released".
7578

79+
This pull request merges the new release into the `develop` branch and bumps the version number.

‎packages/configuration/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ serde = { version = "1.0", features = ["derive"] }
2121
serde_with = "3.2"
2222
thiserror = "1.0"
2323
toml = "0.8"
24-
torrust-tracker-located-error = { version = "3.0.0-alpha.9-develop", path = "../located-error" }
25-
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "../primitives" }
24+
torrust-tracker-located-error = { version = "3.0.0-alpha.10-develop", path = "../located-error" }
25+
torrust-tracker-primitives = { version = "3.0.0-alpha.10-develop", path = "../primitives" }
2626

2727
[dev-dependencies]
2828
uuid = { version = "1", features = ["v4"] }

‎packages/test-helpers/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ version.workspace = true
1717
[dependencies]
1818
lazy_static = "1.4"
1919
rand = "0.8.5"
20-
torrust-tracker-configuration = { version = "3.0.0-alpha.9-develop", path = "../configuration" }
21-
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "../primitives" }
20+
torrust-tracker-configuration = { version = "3.0.0-alpha.10-develop", path = "../configuration" }
21+
torrust-tracker-primitives = { version = "3.0.0-alpha.10-develop", path = "../primitives" }

0 commit comments

Comments
 (0)