Skip to content

Commit 77418d0

Browse files
committed
Remove v prefix from release tags
- Update release script to create tags without v prefix (e.g., 1.3.0 instead of v1.3.0) - Update GitHub Actions workflow to match new tag format - Add semver tag patterns to docker-publish workflow for proper version tagging - This ensures Docker images get tagged with version numbers when releases are created
1 parent dac507e commit 77418d0

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

.github/workflows/docker-publish.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
images: ${{ env.REGISTRY }}/${{ steps.lower-repo.outputs.IMAGE_NAME }}
6161
tags: |
6262
type=raw,value=next,enable=${{ github.ref == 'refs/heads/develop' }}
63+
type=semver,pattern={{version}}
64+
type=semver,pattern={{major}}.{{minor}}
65+
type=semver,pattern={{major}}
6366
6467
- name: Log in to Container registry
6568
if: github.event_name != 'pull_request'
@@ -140,6 +143,9 @@ jobs:
140143
images: ${{ env.REGISTRY }}/${{ steps.lower-repo.outputs.IMAGE_NAME }}
141144
tags: |
142145
type=raw,value=next,enable=${{ github.ref == 'refs/heads/develop' }}
146+
type=semver,pattern={{version}}
147+
type=semver,pattern={{major}}.{{minor}}
148+
type=semver,pattern={{major}}
143149
144150
- name: Log in to Container registry
145151
uses: docker/login-action@v3
@@ -207,6 +213,9 @@ jobs:
207213
images: ${{ env.REGISTRY }}/${{ steps.lower-repo.outputs.ADDON_IMAGE_NAME }}
208214
tags: |
209215
type=raw,value=next,enable=${{ github.ref == 'refs/heads/develop' }}
216+
type=semver,pattern={{version}}
217+
type=semver,pattern={{major}}.{{minor}}
218+
type=semver,pattern={{major}}
210219
211220
- name: Log in to Container registry
212221
if: github.event_name != 'pull_request'
@@ -289,6 +298,9 @@ jobs:
289298
images: ${{ env.REGISTRY }}/${{ steps.lower-repo.outputs.ADDON_IMAGE_NAME }}
290299
tags: |
291300
type=raw,value=next,enable=${{ github.ref == 'refs/heads/develop' }}
301+
type=semver,pattern={{version}}
302+
type=semver,pattern={{major}}.{{minor}}
303+
type=semver,pattern={{major}}
292304
293305
- name: Log in to Container registry
294306
uses: docker/login-action@v3

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
- name: Create GitHub Release
3737
uses: softprops/action-gh-release@v1
3838
with:
39-
tag_name: v${{ github.event.inputs.version }}
39+
tag_name: ${{ github.event.inputs.version }}
4040
name: Release v${{ github.event.inputs.version }}
4141
body: |
4242
Release v${{ github.event.inputs.version }}
4343
44-
See [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/v${{ github.event.inputs.version }}/CHANGELOG.md) for detailed changes.
44+
See [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ github.event.inputs.version }}/CHANGELOG.md) for detailed changes.
4545
draft: false
4646
prerelease: false
4747
env:
@@ -55,10 +55,10 @@ jobs:
5555
echo "📋 Summary:"
5656
echo "- Release branch: release/v${VERSION} (kept for potential hotfixes)"
5757
echo "- Main branch: Updated to v${VERSION}"
58-
echo "- Tag: v${VERSION} created"
58+
echo "- Tag: ${VERSION} created"
5959
echo "- GitHub Release: Created"
6060
echo "- Develop branch: Ready for next development cycle"
6161
echo ""
6262
echo "🔗 Links:"
63-
echo "- Release: https://github.com/${{ github.repository }}/releases/tag/v${VERSION}"
63+
echo "- Release: https://github.com/${{ github.repository }}/releases/tag/${VERSION}"
6464
echo "- Release branch: https://github.com/${{ github.repository }}/tree/release/v${VERSION}"

release.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ if git show-ref --verify --quiet "refs/heads/$RELEASE_BRANCH"; then
9191
fi
9292

9393
# Check if tag already exists
94-
if git show-ref --verify --quiet "refs/tags/v$VERSION"; then
95-
print_error "Tag v$VERSION already exists"
94+
if git show-ref --verify --quiet "refs/tags/$VERSION"; then
95+
print_error "Tag $VERSION already exists"
9696
exit 1
9797
fi
9898

@@ -146,12 +146,12 @@ print_info "Merging release branch into main"
146146
git merge "$RELEASE_BRANCH" --no-ff -m "Merge release v${VERSION}"
147147

148148
# Create and push tag
149-
print_info "Creating tag v${VERSION}"
150-
git tag "v${VERSION}"
149+
print_info "Creating tag ${VERSION}"
150+
git tag "${VERSION}"
151151

152152
print_info "Pushing main branch and tag"
153153
git push origin main
154-
git push origin "v${VERSION}"
154+
git push origin "${VERSION}"
155155

156156
# Switch back to develop
157157
print_info "Switching back to develop branch"
@@ -177,7 +177,7 @@ print_info ""
177177
print_info "Summary:"
178178
print_info "- Release branch: $RELEASE_BRANCH (kept for potential hotfixes)"
179179
print_info "- Main branch: Updated to v${VERSION}"
180-
print_info "- Tag: v${VERSION} created"
180+
print_info "- Tag: ${VERSION} created"
181181
print_info "- Develop branch: Ready for next development cycle"
182182
print_info ""
183183
print_info "Next steps:"

0 commit comments

Comments
 (0)