Skip to content

Commit ae75cfa

Browse files
committed
dev: use releases branch prefix
1 parent a53ee28 commit ae75cfa

File tree

2 files changed

+41
-17
lines changed

2 files changed

+41
-17
lines changed

.github/workflows/container.yaml

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ on:
55
branches:
66
- "develop"
77
- "main"
8-
tags:
9-
- "v*"
8+
- "releases/**/*"
109
pull_request:
1110
branches:
1211
- "develop"
@@ -60,19 +59,33 @@ jobs:
6059

6160
outputs:
6261
continue: ${{ steps.check.outputs.continue }}
62+
type: ${{ steps.check.outputs.type }}
63+
version: ${{ steps.check.outputs.version }}
6364

6465
steps:
6566
- id: check
6667
name: Check Context
6768
run: |
6869
if [[ "${{ github.repository }}" == "torrust/torrust-tracker" ]]; then
6970
if [[ "${{ github.event_name }}" == "push" ]]; then
70-
if [[ "${{ github.ref }}" == "refs/heads/main" ||
71-
"${{ github.ref }}" == "refs/heads/develop" ||
72-
"${{ 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
71+
if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
72+
73+
echo "type=development" >> $GITHUB_OUTPUT
74+
echo "continue=true" >> $GITHUB_OUTPUT
75+
76+
fi
77+
if [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then
78+
79+
echo "type=development" >> $GITHUB_OUTPUT
80+
echo "continue=true" >> $GITHUB_OUTPUT
81+
82+
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
83+
84+
version=$(echo "${{ github.ref }}" | sed -n -E 's/^(refs\/heads\/releases\/)//p')
85+
echo "version=$version" >> $GITHUB_OUTPUT
86+
echo "type=release" >> $GITHUB_OUTPUT
87+
echo "continue=true" >> $GITHUB_OUTPUT
7388
74-
echo "Context is torrust/torrust-tracker, and push is: main, develop, docker, or a tag with a semantic version"
75-
echo "continue=true" >> $GITHUB_OUTPUT
7689
fi
7790
fi
7891
fi
@@ -103,17 +116,28 @@ jobs:
103116
runs-on: ubuntu-latest
104117

105118
steps:
106-
- id: meta
107-
name: Docker meta
119+
- id: meta_development
120+
if: needs.secrets.check.type == 'development'
121+
name: Docker Meta (development)
108122
uses: docker/metadata-action@v4
109123
with:
110124
images: |
111125
"${{ secrets.DOCKER_HUB_USERNAME }}/${{secrets.DOCKER_HUB_REPOSITORY_NAME }}"
112126
tags: |
113127
type=ref,event=branch
114-
type=ref,event=pr
115-
type=semver,pattern={{version}}
116-
type=semver,pattern={{major}}.{{minor}}
128+
129+
- id: meta_release
130+
if: needs.secrets.check.type == 'release'
131+
name: Docker Meta (release)
132+
uses: docker/metadata-action@v4
133+
with:
134+
images: |
135+
"${{ secrets.DOCKER_HUB_USERNAME }}/${{secrets.DOCKER_HUB_REPOSITORY_NAME }}"
136+
tags: |
137+
type=semver,value=${{ needs.secrets.check.version }},pattern={{raw}}
138+
type=semver,value=${{ needs.secrets.check.version }},pattern={{version}}
139+
type=semver,value=${{ needs.secrets.check.version }},pattern=v{{major}}
140+
type=semver,value=${{ needs.secrets.check.version }},pattern={{major}}.{{minor}}
117141
118142
- id: login
119143
name: Login to Docker Hub

.github/workflows/deployment.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Deployment
22

33
on:
44
push:
5-
tags:
6-
- "v*"
5+
branches:
6+
- "releases/**/*"
77

88
jobs:
99
secrets:
@@ -18,8 +18,8 @@ jobs:
1818
- id: check
1919
name: Check
2020
env:
21-
CRATES_TOKEN: "${{ secrets.CRATES_TOKEN }}"
22-
if: "${{ env.CRATES_TOKEN != '' }}"
21+
CARGO_REGISTRY_TOKEN: "${{ secrets.CARGO_REGISTRY_TOKEN }}"
22+
if: "${{ env.CARGO_REGISTRY_TOKEN != '' }}"
2323
run: echo "continue=true" >> $GITHUB_OUTPUT
2424

2525
test:
@@ -66,7 +66,7 @@ jobs:
6666
toolchain: stable
6767

6868
env:
69-
CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}
69+
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
7070

7171
- id: publish
7272
name: Publish Crates

0 commit comments

Comments
 (0)