Skip to content

Commit f690452

Browse files
committed
ci: [#450] support pre-release versions in workflow branch version extraction
1 parent 3812524 commit f690452

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/container.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# Publishing:
1212
# - Images are pushed to Docker Hub on push to main/develop/release branches (not PRs)
13-
# - Release branches (releases/vX.Y.Z) publish versioned Docker tags (X.Y.Z)
13+
# - Release branches (releases/vX.Y.Z or releases/vX.Y.Z-pre.N) publish versioned Docker tags
1414
# - Release Docker tags use bare semver without the v prefix
1515
# - Requires Docker Hub credentials in the dockerhub-torrust GitHub Environment
1616

@@ -111,7 +111,7 @@ jobs:
111111
elif [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then
112112
echo "type=develop" >> $GITHUB_OUTPUT
113113
echo "continue=true" >> $GITHUB_OUTPUT
114-
elif [[ $(echo "${{ github.ref }}" | grep -P '^refs/heads/releases/v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$') ]]; then
114+
elif [[ $(echo "${{ github.ref }}" | grep -P '^refs/heads/releases/v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-[a-zA-Z0-9][a-zA-Z0-9.-]*)?$') ]]; then
115115
version=$(echo "${{ github.ref }}" | sed -n -E 's/^refs\/heads\/releases\///p')
116116
echo "version=$version" >> $GITHUB_OUTPUT
117117
echo "type=release" >> $GITHUB_OUTPUT

.github/workflows/publish-crate.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Crate publication workflow for Torrust Tracker Deployer SDK
22
#
33
# This workflow publishes the SDK crate when a release branch is pushed.
4-
# Trigger branch format: releases/vX.Y.Z
4+
# Trigger branch format: releases/vX.Y.Z or releases/vX.Y.Z-pre.N (pre-release)
55

66
name: Publish Crate
77

@@ -37,12 +37,12 @@ jobs:
3737
- name: Extract Release Version
3838
id: release
3939
run: |
40-
if [[ "${{ github.ref_name }}" =~ ^releases/v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
40+
if [[ "${{ github.ref_name }}" =~ ^releases/v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-[a-zA-Z0-9][a-zA-Z0-9.-]*)?$ ]]; then
4141
version="${GITHUB_REF_NAME#releases/v}"
4242
echo "version=$version" >> "$GITHUB_OUTPUT"
4343
else
4444
echo "Invalid release branch name: ${{ github.ref_name }}" >&2
45-
echo "Expected format: releases/vX.Y.Z" >&2
45+
echo "Expected format: releases/vX.Y.Z or releases/vX.Y.Z-pre.N" >&2
4646
exit 1
4747
fi
4848

0 commit comments

Comments
 (0)