Skip to content

Commit 540f212

Browse files
committed
Use 'Release v' naming and exclude from CI workflow
1 parent 36d74d4 commit 540f212

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Build and Test
1414
runs-on: ubuntu-latest
1515

16-
# Skip CI if commit message contains [skip ci]
17-
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
16+
# Skip CI for automated commits
17+
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !startsWith(github.event.head_commit.message, 'Release v') }}
1818

1919
steps:
2020
- name: Checkout code

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
4747
if [ -z "$PREV_TAG" ]; then
4848
# First release - get all commits (excluding automated commits)
49-
COMMITS=$(git log --pretty=format:"- %s (%h)" --no-merges | grep -v "\[skip ci\]" | grep -v "Update CHANGELOG" | grep -v "Bump version to" | head -20)
49+
COMMITS=$(git log --pretty=format:"- %s (%h)" --no-merges | grep -v "\[skip ci\]" | grep -v "Update CHANGELOG" | grep -v "Release v" | head -20)
5050
else
5151
# Get commits since last version tag (excluding automated commits)
52-
COMMITS=$(git log ${PREV_TAG}..HEAD --pretty=format:"- %s (%h)" --no-merges | grep -v "\[skip ci\]" | grep -v "Update CHANGELOG" | grep -v "Bump version to")
52+
COMMITS=$(git log ${PREV_TAG}..HEAD --pretty=format:"- %s (%h)" --no-merges | grep -v "\[skip ci\]" | grep -v "Update CHANGELOG" | grep -v "Release v")
5353
fi
5454
5555
# Build changelog for GitHub release

release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ main() {
268268
# Create version bump commit
269269
print_step "Creating version bump commit..."
270270
git add LocalizationManager.csproj CHANGELOG.md
271-
git commit -m "Bump version to v${NEW_VERSION}"
271+
git commit -m "Release v${NEW_VERSION}"
272272
print_success "Created version bump commit"
273273

274274
# Store commit SHA for potential rollback

0 commit comments

Comments
 (0)