Merge pull request 'dev' (#29) from dev into master

Reviewed-on: #29
This commit is contained in:
fanantenana 2025-02-06 12:27:00 +00:00
commit aa0438aff5
2 changed files with 15 additions and 15 deletions

View File

@ -26,15 +26,14 @@ jobs:
- name: Find commits from merged pull request - name: Find commits from merged pull request
id: get_commits id: get_commits
run: | run: |
# Concatène les commits en une seule ligne, séparés par ";;" # Concatène les commits sur une seule ligne avec "|||" comme séparateur
COMMITS=$(git log HEAD^..HEAD --oneline --no-merges | paste -sd ";;" -) COMMITS=$(git log HEAD^..HEAD --oneline --no-merges | paste -sd "|||" -)
if [ -z "$COMMITS" ]; then if [ -z "$COMMITS" ]; then
echo "No commits found in the merged PR." echo "No commits found in the merged PR."
exit 0 exit 0
fi fi
echo "Commits from merged PR:" echo "Commits from merged PR:"
echo "$COMMITS" echo "$COMMITS"
# On exporte la variable en une seule ligne
echo "COMMITS=$COMMITS" >> "$GITHUB_ENV" echo "COMMITS=$COMMITS" >> "$GITHUB_ENV"
- name: Extract current version - name: Extract current version
@ -132,16 +131,16 @@ jobs:
- name: Generate Changelog for merged PR - name: Generate Changelog for merged PR
run: | run: |
echo "DEBUG: Raw COMMITS = [${{ env.COMMITS }}]" echo "DEBUG: Raw COMMITS = [${{ env.COMMITS }}]"
# Reconstruire la liste des commits en remplaçant ";;" par des retours à la ligne # Reconstruit la liste multi-lignes en remplaçant "|||" par un retour à la ligne
COMMITS=$(echo "${{ env.COMMITS }}" | sed 's/;;/\n/g') COMMITS=$(echo "${{ env.COMMITS }}" | sed 's/|||/\n/g')
echo "DEBUG: COMMITS after conversion = [$COMMITS]" echo "DEBUG: COMMITS after conversion = [$COMMITS]"
CHANGELOG_FILE="CHANGELOG.md" CHANGELOG_FILE="CHANGELOG.md"
DATE=$(date +"%Y-%m-%d") DATE=$(date +"%Y-%m-%d")
NEW_VERSION="${{ env.NEW_VERSION }}" NEW_VERSION="${{ env.NEW_VERSION }}"
NEW_BUILD="${{ env.NEW_BUILD }}" NEW_BUILD="${{ env.NEW_BUILD }}"
# Créer le fichier changelog s'il n'existe pas # Crée le fichier changelog s'il n'existe pas
if [ ! -f "$CHANGELOG_FILE" ]; then if [ ! -f "$CHANGELOG_FILE" ]; then
echo "# Changelog" > "$CHANGELOG_FILE" echo "# Changelog" > "$CHANGELOG_FILE"
fi fi
@ -150,42 +149,43 @@ jobs:
{ {
echo "## $NEW_VERSION+$NEW_BUILD ($DATE)" echo "## $NEW_VERSION+$NEW_BUILD ($DATE)"
echo "" echo ""
echo "### Breaking Changes" echo "### Breaking Changes"
BREAKING=$(echo "$COMMITS" | grep -i "breaking:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+breaking:[[:space:]]+/- (#\1) /g') BREAKING=$(echo "$COMMITS" | grep -i "breaking:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+breaking:[[:space:]]+/- (#\1) /g')
echo "${BREAKING:-No breaking changes found.}" echo "${BREAKING:-No breaking changes found.}"
echo "" echo ""
echo "### Features" echo "### Features"
FEATURES=$(echo "$COMMITS" | grep -i "feat:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+feat:[[:space:]]+/- (#\1) /g') FEATURES=$(echo "$COMMITS" | grep -i "feat:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+feat:[[:space:]]+/- (#\1) /g')
echo "${FEATURES:-No features found.}" echo "${FEATURES:-No features found.}"
echo "" echo ""
echo "### Bug Fixes" echo "### Bug Fixes"
BUG_FIXES=$(echo "$COMMITS" | grep -i "fix:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+fix:[[:space:]]+/- (#\1) /g') BUG_FIXES=$(echo "$COMMITS" | grep -i "fix:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+fix:[[:space:]]+/- (#\1) /g')
echo "${BUG_FIXES:-No bug fixes found.}" echo "${BUG_FIXES:-No bug fixes found.}"
echo "" echo ""
echo "### Refactors" echo "### Refactors"
REFACTOR=$(echo "$COMMITS" | grep -i "refactor:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+refactor:[[:space:]]+/- (#\1) /g') REFACTOR=$(echo "$COMMITS" | grep -i "refactor:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+refactor:[[:space:]]+/- (#\1) /g')
echo "${REFACTOR:-No refactors found.}" echo "${REFACTOR:-No refactors found.}"
echo "" echo ""
echo "### Style Changes" echo "### Style Changes"
STYLE=$(echo "$COMMITS" | grep -i "style:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+style:[[:space:]]+/- (#\1) /g') STYLE=$(echo "$COMMITS" | grep -i "style:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+style:[[:space:]]+/- (#\1) /g')
echo "${STYLE:-No style changes found.}" echo "${STYLE:-No style changes found.}"
echo "" echo ""
echo "### Chores" echo "### Chores"
CHORES=$(echo "$COMMITS" | grep -i "chore:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+chore:[[:space:]]+/- (#\1) /g') CHORES=$(echo "$COMMITS" | grep -i "chore:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+chore:[[:space:]]+/- (#\1) /g')
echo "${CHORES:-No chores found.}" echo "${CHORES:-No chores found.}"
echo "" echo ""
echo "### Miscellaneous" echo "### Miscellaneous"
MISC=$(echo "$COMMITS" | grep -ivE "breaking:|feat:|fix:|refactor:|style:|chore:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+/- (#\1) /g') MISC=$(echo "$COMMITS" | grep -ivE "breaking:|feat:|fix:|refactor:|style:|chore:" || true | sed -E 's/^[[:space:]]*([a-f0-9]+)[[:space:]]+/- (#\1) /g')
echo "${MISC:-No miscellaneous changes found.}" echo "${MISC:-No miscellaneous changes found.}"
echo "" echo ""
# On conserve l'ancien contenu du changelog en bas
cat "$CHANGELOG_FILE" cat "$CHANGELOG_FILE"
} > "$TEMP_CHANGELOG" } > "$TEMP_CHANGELOG"

View File

@ -31,7 +31,7 @@ class MyHomePage extends StatefulWidget {
} }
class _MyHomePageState extends State<MyHomePage> { class _MyHomePageState extends State<MyHomePage> {
int _counter = 0; int _counter = 1;
void _incrementCounter() { void _incrementCounter() {
setState(() { setState(() {