Merge torrust#409: dev: use releases branch prefix

6665a05 dev: use releases branch prefix (Cameron Garnham)
a53ee28 release: bump alpha version (Cameron Garnham)

Pull request description:

  closes torrust#407

ACKs for top commit:
  da2ce7:
    ACK 6665a05

Tree-SHA512: 4fcb8f7c0e06df4a71f6615fcb2d10f732e634a4c48e9f806e9b63ab923248348d6e1316bac65cb3538e306ce20566a8b8d228d5e8acca05253c10f879435a6e

.github/workflows/container.yaml

@@ -5,8 +5,7 @@ on:
     branches:
       - "develop"
       - "main"
-    tags:
-      - "v*"
+      - "releases/**/*"
   pull_request:
     branches:
       - "develop"
@@ -60,19 +59,34 @@ jobs:
 
     outputs:
       continue: ${{ steps.check.outputs.continue }}
+      type: ${{ steps.check.outputs.type }}
+      version: ${{ steps.check.outputs.version }}
 
     steps:
       - id: check
         name: Check Context
         run: |
           if [[ "${{ github.repository }}" == "torrust/torrust-tracker" ]]; then
             if [[ "${{ github.event_name }}" == "push" ]]; then
-              if [[ "${{ github.ref }}" == "refs/heads/main" ||
-                    "${{ github.ref }}" == "refs/heads/develop" ||
-                    "${{ github.ref }}" =~ ^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
+              if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+
+                echo "type=development" >> $GITHUB_OUTPUT
+                echo "continue=true" >> $GITHUB_OUTPUT
+
+              fi
+              if [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then
+
+                echo "type=development" >> $GITHUB_OUTPUT
+                echo "continue=true" >> $GITHUB_OUTPUT
+
+              fi
+              if [[ "${{ 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
+
+                version=$(echo "${{ github.ref }}" | sed -n -E 's/^(refs\/heads\/releases\/)//p')
+                echo "version=$version" >> $GITHUB_OUTPUT
+                echo "type=release" >> $GITHUB_OUTPUT
+                echo "continue=true" >> $GITHUB_OUTPUT
 
-                  echo "Context is torrust/torrust-tracker, and push is: main, develop, docker, or a tag with a semantic version"
-                  echo "continue=true" >> $GITHUB_OUTPUT
               fi
             fi
           fi
@@ -103,17 +117,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - id: meta
-        name: Docker meta
+      - id: meta_development
+        if: needs.secrets.check.type == 'development'
+        name: Docker Meta (development)
         uses: docker/metadata-action@v4
         with:
           images: |
             "${{ secrets.DOCKER_HUB_USERNAME }}/${{secrets.DOCKER_HUB_REPOSITORY_NAME }}"
           tags: |
             type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
+
+      - id: meta_release
+        if: needs.secrets.check.type == 'release'
+        name: Docker Meta (release)
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            "${{ secrets.DOCKER_HUB_USERNAME }}/${{secrets.DOCKER_HUB_REPOSITORY_NAME }}"
+          tags: |
+            type=semver,value=${{ needs.secrets.check.version }},pattern={{raw}}
+            type=semver,value=${{ needs.secrets.check.version }},pattern={{version}}
+            type=semver,value=${{ needs.secrets.check.version }},pattern=v{{major}}
+            type=semver,value=${{ needs.secrets.check.version }},pattern={{major}}.{{minor}}
 
       - id: login
         name: Login to Docker Hub

.github/workflows/deployment.yaml

@@ -2,8 +2,8 @@ name: Deployment
 
 on:
   push:
-    tags:
-      - "v*"
+    branches:
+      - "releases/**/*"
 
 jobs:
   secrets:
@@ -18,8 +18,8 @@ jobs:
       - id: check
         name: Check
         env:
-          CRATES_TOKEN: "${{ secrets.CRATES_TOKEN }}"
-        if: "${{ env.CRATES_TOKEN != '' }}"
+          CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}"
+        if: "${{ env.CARGO_REGISTRY_TOKEN != '' }}"
         run: echo "continue=true" >> $GITHUB_OUTPUT
 
   test:
@@ -66,7 +66,7 @@ jobs:
           toolchain: stable
 
         env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
 
       - id: publish
         name: Publish Crates

Cargo.toml

@@ -29,7 +29,7 @@ license-file = "COPYRIGHT"
 publish = true
 repository = "https://github.com/torrust/torrust-tracker"
 rust-version = "1.72"
-version = "3.0.0-alpha.4"
+version = "3.0.0-alpha.5"
 
 
 [dependencies]
@@ -66,10 +66,10 @@ axum = "0.6.20"
 axum-server = { version = "0.5", features = ["tls-rustls"] }
 axum-client-ip = "0.4.1"
 tower-http = { version = "0.4.3", features = ["compression-full"] }
-torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.4", path = "contrib/bencode"}
-torrust-tracker-primitives = { version = "3.0.0-alpha.4", path = "packages/primitives" }
-torrust-tracker-configuration = { version = "3.0.0-alpha.4", path = "packages/configuration" }
-torrust-tracker-located-error = { version = "3.0.0-alpha.4", path = "packages/located-error" }
+torrust-tracker-contrib-bencode = { version = "3.0.0-alpha.5", path = "contrib/bencode"}
+torrust-tracker-primitives = { version = "3.0.0-alpha.5", path = "packages/primitives" }
+torrust-tracker-configuration = { version = "3.0.0-alpha.5", path = "packages/configuration" }
+torrust-tracker-located-error = { version = "3.0.0-alpha.5", path = "packages/located-error" }
 multimap = "0.9"
 hyper = "0.14"
 
@@ -80,7 +80,7 @@ serde_urlencoded = "0.7"
 serde_repr = "0.1"
 serde_bytes = "0.11"
 local-ip-address = "0.5"
-torrust-tracker-test-helpers = { version = "3.0.0-alpha.4", path = "packages/test-helpers" }
+torrust-tracker-test-helpers = { version = "3.0.0-alpha.5", path = "packages/test-helpers" }
 
 [workspace]
 members = [

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.4/torrust_tracker/servers/apis/v1
-[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.4/torrust_tracker/servers/http
-[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.4/torrust_tracker/servers/udp
+[api]: https://docs.rs/torrust-tracker/3.0.0-alpha.5/torrust_tracker/servers/apis/v1
+[http]: https://docs.rs/torrust-tracker/3.0.0-alpha.5/torrust_tracker/servers/http
+[udp]: https://docs.rs/torrust-tracker/3.0.0-alpha.5/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.4/torrust_tracker/servers/apis/v1
+[API documentation]: https://docs.rs/torrust-tracker/3.0.0-alpha.5/torrust_tracker/servers/apis/v1
 [discussions]: https://github.com/torrust/torrust-tracker/discussions
 
 [COPYRIGHT]: ./COPYRIGHT

packages/configuration/Cargo.toml

@@ -22,8 +22,8 @@ config = "0.13"
 toml = "0.7"
 log = { version = "0.4", features = ["release_max_level_info"] }
 thiserror = "1.0"
-torrust-tracker-primitives = { version = "3.0.0-alpha.4", path = "../primitives" }
-torrust-tracker-located-error = { version = "3.0.0-alpha.4", path = "../located-error" }
+torrust-tracker-primitives = { version = "3.0.0-alpha.5", path = "../primitives" }
+torrust-tracker-located-error = { version = "3.0.0-alpha.5", path = "../located-error" }
 
 [dev-dependencies]
 uuid = { version = "1", features = ["v4"] }

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.4", path = "../configuration" }
-torrust-tracker-primitives = { version = "3.0.0-alpha.4", path = "../primitives" }
+torrust-tracker-configuration = { version = "3.0.0-alpha.5", path = "../configuration" }
+torrust-tracker-primitives = { version = "3.0.0-alpha.5", path = "../primitives" }