Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
echo "continue=true" >> $GITHUB_OUTPUT
echo "On \`develop\` Branch, Type: \`development\`"

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
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

version=$(echo "${{ github.ref }}" | sed -n -E 's/^(refs\/heads\/releases\/)//p')
echo "version=$version" >> $GITHUB_OUTPUT
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9-develop"
version = "3.0.0-alpha.10-develop"

[dependencies]
aquatic_udp_protocol = "0.8"
Expand Down Expand Up @@ -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.9-develop", path = "packages/configuration" }
torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.9-develop", path = "contrib/bencode" }
torrust-tracker-located-error = { version = "3.0.0-alpha.9-develop", path = "packages/located-error" }
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "packages/primitives" }
torrust-tracker-configuration = { version = "3.0.0-alpha.10-develop", path = "packages/configuration" }
torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.10-develop", path = "contrib/bencode" }
torrust-tracker-located-error = { version = "3.0.0-alpha.10-develop", path = "packages/located-error" }
torrust-tracker-primitives = { version = "3.0.0-alpha.10-develop", path = "packages/primitives" }
tower-http = { version = "0.4", features = ["compression-full"] }
uuid = { version = "1", features = ["v4"] }

Expand All @@ -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.9-develop", path = "packages/test-helpers" }
torrust-tracker-test-helpers = { version = "3.0.0-alpha.10-develop", path = "packages/test-helpers" }

[workspace]
members = ["contrib/bencode", "packages/configuration", "packages/located-error", "packages/primitives", "packages/test-helpers"]
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9-develop/torrust_tracker/servers/apis/v1
[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-develop/torrust_tracker/servers/http
[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-develop/torrust_tracker/servers/udp
[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/apis/v1
[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/http
[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-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.9-develop/torrust_tracker/servers/apis/v1
[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.10-develop/torrust_tracker/servers/apis/v1
[discussions]: https://github.com/torrust/torrust-tracker/discussions

[COPYRIGHT]: ./COPYRIGHT
Expand Down
8 changes: 6 additions & 2 deletions docs/release_process.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Torrust Tracker Release Process (v2.2.0)
# Torrust Tracker Release Process (v2.2.1)

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

### 4. Create and Merge Pull Request from `staging/main` into `main` branch.

Pull request title format: "Release Version `[semantic version]`".

This pull request merges the new version into the `main` branch.

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

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

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

This pull request merges the new release into the `develop` branch and bumps the version number.
4 changes: 2 additions & 2 deletions packages/configuration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9-develop", path = "../located-error" }
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "../primitives" }
torrust-tracker-located-error = { version = "3.0.0-alpha.10-develop", path = "../located-error" }
torrust-tracker-primitives = { version = "3.0.0-alpha.10-develop", path = "../primitives" }

[dev-dependencies]
uuid = { version = "1", features = ["v4"] }
4 changes: 2 additions & 2 deletions packages/test-helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ version.workspace = true
[dependencies]
lazy_static = "1.4"
rand = "0.8.5"
torrust-tracker-configuration = { version = "3.0.0-alpha.9-develop", path = "../configuration" }
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "../primitives" }
torrust-tracker-configuration = { version = "3.0.0-alpha.10-develop", path = "../configuration" }
torrust-tracker-primitives = { version = "3.0.0-alpha.10-develop", path = "../primitives" }