Skip to content

Commit 2b57574

Browse files
committed
Merge #448: Prepare for 3.0.0-alpha.9
de884dd develop: bump version 3.0.0-alpha.9-develop (Cameron Garnham) b990e77 docs: update release process (Cameron Garnham) 9fb75e4 ci: secret checks were unnecessary (Cameron Garnham) 4e116f5 github: add codeowners file (Cameron Garnham) Pull request description: ACKs for top commit: da2ce7: ACK de884dd Tree-SHA512: 93a0993c3e4ab1fe70edd2917b15f3db9da67534f922db390f24565181d09ef6ef539aec548e42e3c0223b021c2f1809578b88449b9f2bfe5b8cea4859e45297
2 parents 5da13ff + de884dd commit 2b57574

10 files changed

Lines changed: 36 additions & 87 deletions

File tree

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/.github/**/* @torrust/maintainers

.github/workflows/container.yaml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454

5555
context:
5656
name: Context
57+
needs: test
5758
runs-on: ubuntu-latest
5859

5960
outputs:
@@ -97,29 +98,11 @@ jobs:
9798
echo "On a Forked Repository. Will Not Continue"
9899
fi
99100
100-
secrets:
101-
name: Secrets
102-
needs: [test, context]
103-
environment: dockerhub-torrust
104-
if: needs.context.outputs.continue == 'true'
105-
runs-on: ubuntu-latest
106-
107-
outputs:
108-
continue: ${{ steps.check.outputs.continue }}
109-
110-
steps:
111-
- id: check
112-
name: Check
113-
env:
114-
DOCKER_HUB_ACCESS_TOKEN: "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}"
115-
if: "${{ env.DOCKER_HUB_ACCESS_TOKEN != '' }}"
116-
run: echo "continue=true" >> $GITHUB_OUTPUT
117-
118101
publish_development:
119102
name: Publish (Development)
120103
environment: dockerhub-torrust
121-
needs: [secrets, context]
122-
if: needs.secrets.outputs.continue == 'true' && needs.context.outputs.type == 'development'
104+
needs: context
105+
if: needs.context.outputs.continue == 'true' && needs.context.outputs.type == 'development'
123106
runs-on: ubuntu-latest
124107

125108
steps:
@@ -156,8 +139,8 @@ jobs:
156139
publish_release:
157140
name: Publish (Release)
158141
environment: dockerhub-torrust
159-
needs: [secrets, context]
160-
if: needs.secrets.outputs.continue == 'true' && needs.context.outputs.type == 'release'
142+
needs: context
143+
if: needs.context.outputs.continue == 'true' && needs.context.outputs.type == 'release'
161144
runs-on: ubuntu-latest
162145

163146
steps:

.github/workflows/coverage.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,9 @@ env:
1212
CARGO_TERM_COLOR: always
1313

1414
jobs:
15-
secrets:
16-
name: Secrets
17-
environment: coverage
18-
runs-on: ubuntu-latest
19-
20-
outputs:
21-
continue: ${{ steps.check.outputs.continue }}
22-
23-
steps:
24-
- id: check
25-
name: Check
26-
env:
27-
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
28-
if: "${{ env.CODECOV_TOKEN != '' }}"
29-
run: echo "continue=true" >> $GITHUB_OUTPUT
30-
3115
report:
3216
name: Report
3317
environment: coverage
34-
needs: secrets
35-
if: needs.secrets.outputs.continue == 'true'
3618
runs-on: ubuntu-latest
3719
env:
3820
CARGO_INCREMENTAL: "0"

.github/workflows/deployment.yaml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,8 @@ on:
66
- "releases/**/*"
77

88
jobs:
9-
secrets:
10-
name: Secrets
11-
environment: crates-io-torrust
12-
runs-on: ubuntu-latest
13-
14-
outputs:
15-
continue: ${{ steps.check.outputs.continue }}
16-
17-
steps:
18-
- id: check
19-
name: Check
20-
env:
21-
CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}"
22-
if: "${{ env.CARGO_REGISTRY_TOKEN != '' }}"
23-
run: echo "continue=true" >> $GITHUB_OUTPUT
24-
259
test:
2610
name: Test
27-
needs: secrets
28-
if: needs.secrets.outputs.continue == 'true'
2911
runs-on: ubuntu-latest
3012

3113
strategy:
@@ -49,7 +31,7 @@ jobs:
4931

5032
publish:
5133
name: Publish
52-
environment: crates-io-torrust
34+
environment: deployment
5335
needs: test
5436
runs-on: ubuntu-latest
5537

@@ -67,7 +49,7 @@ jobs:
6749
- id: publish
6850
name: Publish Crates
6951
env:
70-
CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}"
52+
CARGO_REGISTRY_TOKEN: "${{ secrets.TORRUST_UPDATE_CARGO_REGISTRY_TOKEN }}"
7153
run: |
7254
cargo publish -p torrust-tracker-contrib-bencode
7355
cargo publish -p torrust-tracker-located-error

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.8-develop"
29+
version = "3.0.0-alpha.9-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.8-develop", path = "packages/configuration" }
60-
torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.8-develop", path = "contrib/bencode" }
61-
torrust-tracker-located-error = { version = "3.0.0-alpha.8-develop", path = "packages/located-error" }
62-
torrust-tracker-primitives = { version = "3.0.0-alpha.8-develop", path = "packages/primitives" }
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" }
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.8-develop", path = "packages/test-helpers" }
73+
torrust-tracker-test-helpers = { version = "3.0.0-alpha.9-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.8-develop/torrust_tracker/servers/apis/v1
183-
[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/http
184-
[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.8-develop/torrust_tracker/servers/udp
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
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.8-develop/torrust_tracker/servers/apis/v1
188+
[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.9-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: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Torrust Tracker Release Process (draft 2)
1+
# Torrust Tracker Release Process (v2.1.0-draft)
22

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

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

1414
- [ ] `develop` is ready for branching for a release.
15-
- [ ] force-push develop to `staging` branch.
15+
- [ ] force-push `develop` to `staging/main` branch.
1616
- [ ] commit `release: version (semantic version)`, that removes the `-develop` suffix.
17-
- [ ] create pull request to merge `staging` into `main` branch.
18-
- [ ] check all status checks succeed for `main` branch.
19-
- [ ] push `main` branch to `releases/(semantic version)` branch.
17+
- [ ] create pull request to merge `staging/main` into `main` branch.
18+
- [ ] push `main` branch to `releases/v(semantic version)` branch.
2019
- [ ] check all status checks success for `releases/(semantic version)` branch.
2120
- [ ] create signed `v(semantic version)` tag from `releases/(semantic version) HEAD`.
2221
- [ ] create github release from `v(semantic version)` tag.
23-
- [ ] merge the `main` branch back into `develop` branch, assuring that the (semantic version) has the suffix `-develop`.
22+
- [ ] force-push `main` to `staging/develop` branch.
23+
- [ ] commit `develop: bump version (semantic version)-develop`, that bumps the version and adds the `-develop` suffix.
24+
- [ ] create pull request to merge `staging/develop` into `develop` branch.
2425

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

2930
## Development Branch
3031

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

0 commit comments

Comments
 (0)