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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.github/**/* @torrust/maintainers
27 changes: 5 additions & 22 deletions .github/workflows/container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:

context:
name: Context
needs: test
runs-on: ubuntu-latest

outputs:
Expand Down Expand Up @@ -97,29 +98,11 @@ jobs:
echo "On a Forked Repository. Will Not Continue"
fi

secrets:
name: Secrets
needs: [test, context]
environment: dockerhub-torrust
if: needs.context.outputs.continue == 'true'
runs-on: ubuntu-latest

outputs:
continue: ${{ steps.check.outputs.continue }}

steps:
- id: check
name: Check
env:
DOCKER_HUB_ACCESS_TOKEN: "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}"
if: "${{ env.DOCKER_HUB_ACCESS_TOKEN != '' }}"
run: echo "continue=true" >> $GITHUB_OUTPUT

publish_development:
name: Publish (Development)
environment: dockerhub-torrust
needs: [secrets, context]
if: needs.secrets.outputs.continue == 'true' && needs.context.outputs.type == 'development'
needs: context
if: needs.context.outputs.continue == 'true' && needs.context.outputs.type == 'development'
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -156,8 +139,8 @@ jobs:
publish_release:
name: Publish (Release)
environment: dockerhub-torrust
needs: [secrets, context]
if: needs.secrets.outputs.continue == 'true' && needs.context.outputs.type == 'release'
needs: context
if: needs.context.outputs.continue == 'true' && needs.context.outputs.type == 'release'
runs-on: ubuntu-latest

steps:
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,9 @@ env:
CARGO_TERM_COLOR: always

jobs:
secrets:
name: Secrets
environment: coverage
runs-on: ubuntu-latest

outputs:
continue: ${{ steps.check.outputs.continue }}

steps:
- id: check
name: Check
env:
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
if: "${{ env.CODECOV_TOKEN != '' }}"
run: echo "continue=true" >> $GITHUB_OUTPUT

report:
name: Report
environment: coverage
needs: secrets
if: needs.secrets.outputs.continue == 'true'
runs-on: ubuntu-latest
env:
CARGO_INCREMENTAL: "0"
Expand Down
22 changes: 2 additions & 20 deletions .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,8 @@ on:
- "releases/**/*"

jobs:
secrets:
name: Secrets
environment: crates-io-torrust
runs-on: ubuntu-latest

outputs:
continue: ${{ steps.check.outputs.continue }}

steps:
- id: check
name: Check
env:
CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}"
if: "${{ env.CARGO_REGISTRY_TOKEN != '' }}"
run: echo "continue=true" >> $GITHUB_OUTPUT

test:
name: Test
needs: secrets
if: needs.secrets.outputs.continue == 'true'
runs-on: ubuntu-latest

strategy:
Expand All @@ -49,7 +31,7 @@ jobs:

publish:
name: Publish
environment: crates-io-torrust
environment: deployment
needs: test
runs-on: ubuntu-latest

Expand All @@ -67,7 +49,7 @@ jobs:
- id: publish
name: Publish Crates
env:
CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}"
CARGO_REGISTRY_TOKEN: "${{ secrets.TORRUST_UPDATE_CARGO_REGISTRY_TOKEN }}"
run: |
cargo publish -p torrust-tracker-contrib-bencode
cargo publish -p torrust-tracker-located-error
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.8-develop"
version = "3.0.0-alpha.9-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.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.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" }
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.8-develop", path = "packages/test-helpers" }
torrust-tracker-test-helpers = { version = "3.0.0-alpha.9-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.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.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

[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.9-develop/torrust_tracker/servers/apis/v1
[discussions]: https://github.com/torrust/torrust-tracker/discussions

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

The purpose of this document is to describe the release process.

Expand All @@ -12,19 +12,20 @@ Torrust Tracker is published according to this protocol:
- The version is bumped according to releases, new features, and breaking changes.

- [ ] `develop` is ready for branching for a release.
- [ ] force-push develop to `staging` branch.
- [ ] force-push `develop` to `staging/main` branch.
- [ ] 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/(semantic version)` branch.
- [ ] create pull request to merge `staging/main` into `main` branch.
- [ ] push `main` branch to `releases/v(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`.
- [ ] force-push `main` to `staging/develop` branch.
- [ ] commit `develop: bump version (semantic version)-develop`, that bumps the version and adds the `-develop` suffix.
- [ ] create pull request to merge `staging/develop` into `develop` branch.

- At step `1.`, `develop` is automatically published to `dockerhub`.
- At step `3.`, `main` is automatically published to `dockerhub`.
- At step `6.`, `releases\v(semantic version)` is automatically published to `dockerhub` and `crate.io`.
- At step `6.`, `releases/v(semantic version)` is automatically published to `dockerhub` and `crate.io`.

## Development Branch

Expand Down
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.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.9-develop", path = "../located-error" }
torrust-tracker-primitives = { version = "3.0.0-alpha.9-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.8-develop", path = "../configuration" }
torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "../primitives" }
torrust-tracker-configuration = { version = "3.0.0-alpha.9-develop", path = "../configuration" }
torrust-tracker-primitives = { version = "3.0.0-alpha.9-develop", path = "../primitives" }