Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/auto-release-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@ jobs:
RELEASE_TYPE=""
NEW_VERSION=""

if [[ "$COMMIT_MSG" =~ ^(feat|feature)(\(.+\))?!: ]] || [[ "$COMMIT_MSG" =~ BREAKING[[:space:]]CHANGE ]]; then
# Behandle Merge-Commits speziell
if [[ "$COMMIT_MSG" =~ ^Merge[[:space:]]pull[[:space:]]request ]]; then
echo "Merge commit detected, analyzing PR content..."
# Für Merge-Commits: Minor release (neue Features zusammengeführt)
SHOULD_RELEASE="true"
RELEASE_TYPE="minor"
NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. '{print $1"."$2+1".0"}')
elif [[ "$COMMIT_MSG" =~ ^(feat|feature)(\(.+\))?!: ]] || [[ "$COMMIT_MSG" =~ BREAKING[[:space:]]CHANGE ]]; then
# Major release (breaking change)
SHOULD_RELEASE="true"
RELEASE_TYPE="major"
Expand Down
118 changes: 118 additions & 0 deletions RELEASE_WORKFLOW_FIX.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# 🔧 Release Workflow Fix

## 🚨 Problem identifiziert

### Symptome:
```
Commit message: Merge pull request #9 from securebitsorg/feature/github-releases-documentation
Current version: 1.9.1
Last tag version: 0.0.0 ← Problem!
Should release: false ← Problem!
Release type:
New version:
```

### Root Cause:
1. **Merge-Commits nicht erkannt** - Workflow erkennt nur Conventional Commits
2. **Tag-Erkennung fehlerhaft** - `git describe --tags --abbrev=0` gibt "0.0.0" zurück
3. **Versionssynchronisation** - Lokale Dateien vs. Remote Tags inkonsistent

## ✅ Implementierte Lösung

### 1. Merge-Commit-Unterstützung
```yaml
# Behandle Merge-Commits speziell
if [[ "$COMMIT_MSG" =~ ^Merge[[:space:]]pull[[:space:]]request ]]; then
echo "Merge commit detected, analyzing PR content..."
# Für Merge-Commits: Minor release (neue Features zusammengeführt)
SHOULD_RELEASE="true"
RELEASE_TYPE="minor"
NEW_VERSION=$(echo $CURRENT_VERSION | awk -F. '{print $1"."$2+1".0"}')
```

### 2. Versionssynchronisation
**Vor dem Fix:**
- VERSION: 1.9.1
- __version__.py: 1.9.1
- pyproject.toml: 1.9.1
- Git Tag: v1.10.0 ← Inkonsistenz!

**Nach dem Fix:**
- VERSION: 1.10.0 ✓
- __version__.py: 1.10.0 ✓
- pyproject.toml: 1.10.0 ✓
- Git Tag: v1.10.0 ✓

### 3. Verbesserte Tag-Erkennung
```bash
# Robustere Tag-Erkennung
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
LAST_TAG_VERSION=${LAST_TAG#v}
echo "Last tag version: $LAST_TAG_VERSION"
```

## 🎯 Release-Trigger-Patterns

### Automatische Releases:
1. **Merge PR**: `Merge pull request #X` → Minor Release
2. **Feature**: `feat: neue funktion` → Minor Release
3. **Fix**: `fix: bugfix` → Patch Release
4. **Breaking**: `feat!: breaking change` → Major Release
5. **Manual**: `[release]` in Commit-Message → Patch Release

### Beispiel-Workflow:
```bash
# 1. Feature-Branch entwickeln
git checkout -b feature/neue-funktion
git commit -m "feat: neue coole funktion"
git push origin feature/neue-funktion

# 2. Pull Request erstellen und mergen
# → Automatisch: v1.10.0 → v1.11.0 (Minor)

# 3. Hotfix direkt auf main
git commit -m "fix: kritischer bugfix"
git push origin main
# → Automatisch: v1.11.0 → v1.11.1 (Patch)
```

## 🧪 Testing

### Nächster Test:
1. Merge diesen PR
2. Erwartetes Ergebnis:
```
Commit message: Merge pull request #X
Current version: 1.10.0
Last tag version: 1.10.0
Should release: true
Release type: minor
New version: 1.11.0
```

## 📋 Zukünftige Verbesserungen

### Option 1: Semantic Release Integration
```yaml
- uses: cycjimmy/semantic-release-action@v3
with:
semantic_version: 19
branches: |
[
'main'
]
```

### Option 2: Automatische Version-Sync
```yaml
- name: Sync version files
run: |
NEW_VERSION=${{ steps.release.outputs.new_version }}
echo "$NEW_VERSION" > VERSION
sed -i "s/__version__ = \".*\"/__version__ = \"$NEW_VERSION\"/" __version__.py
sed -i "s/version = \".*\"/version = \"$NEW_VERSION\"/" pyproject.toml
```

---

*Problem behoben in v1.10.1* 🚀
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.1
1.10.0
4 changes: 2 additions & 2 deletions __version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
Version information for Bash-Script-Maker
"""

__version__ = "1.9.1"
__version_info__ = (1, 9, 1)
__version__ = "1.10.0"
__version_info__ = (1, 10, 0)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "bash-script-maker"
version = "1.9.1"
version = "1.10.0"
description = "Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung"
readme = "README.md"
license = {text = "MIT"}
Expand Down