diff --git a/CHANGES.md b/CHANGES.md index c44f39f..e65c7a6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Release 0.3.4p82 du 01/03/2025-06:23 + +## Release 0.3.4p74 du 01/03/2025-06:22 + +* `62b9230` pdev: ne pas inscrire delete si cette opération est interdite +* `2163ea9` pdev/prel: scripts post merge/release + ## Release 0.3.2p82 du 28/02/2025-20:30 ## Release 0.3.2p74 du 28/02/2025-20:28 diff --git a/VERSION.txt b/VERSION.txt index d15723f..42045ac 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.3.2 +0.3.4 diff --git a/bash/src/pman.sh b/bash/src/pman.sh index 9df7df9..8c12d1c 100644 --- a/bash/src/pman.sh +++ b/bash/src/pman.sh @@ -45,7 +45,7 @@ $0 !~ // { print } function _filter_changes() { # enlever les commits "inutiles" pour générer le fichier CHANGES.md grep -vE '^([+|] )?[0-9a-f]+ modifs\.mineures sans commentaires$' | - grep -vE '^([+|] )?[0-9a-f]+ (cosmetic|typo|bug|fix|maj projet|maj deps)\$' + grep -vE '^([+|] )?[0-9a-f]+ (cosmetic|typo|bug|fix|maj projet|maj deps)$' } function _format_md() { @@ -167,7 +167,17 @@ function load_branches() { "$HOTFIX"*) SrcType=hotfix; DestBranch="$MAIN";; "$MAIN") SrcType=main; DestBranch="$DIST";; "$DIST") SrcType=dist; DestBranch=;; - *) DestBranch=;; + *) SrcType=; DestBranch=;; + esac + case "$DestBranch" in + "$UPSTREAM") DestType=upstream;; + "$FEATURE"*) DestType=feature;; + "$DEVELOP") DestType=develop;; + "$RELEASE"*) DestType=release;; + "$HOTFIX"*) DestType=hotfix;; + "$MAIN") DestType=main;; + "$DIST") DestType=dist;; + *) DestType=;; esac local branch @@ -275,6 +285,11 @@ function _mscript_start() { #!/bin/bash $(qvals source "$NULIBDIR/load.sh") || exit 1 +$(echo_setv SrcBranch="$SrcBranch") +$(echo_setv SrcType="$SrcType") +$(echo_setv DestBranch="$DestBranch") +$(echo_setv DestType="$DestType") + merge= delete= push= @@ -330,6 +345,14 @@ function _rscript_start() { #!/bin/bash $(qvals source "$NULIBDIR/load.sh") || exit 1 +$(echo_setv SrcBranch="$SrcBranch") +$(echo_setv SrcType="$SrcType") +$(echo_setv Version="$Version") +$(echo_setv Tag="$Tag") +$(echo_setv ReleaseBranch="$ReleaseBranch") +$(echo_setv DestBranch="$DestBranch") +$(echo_setv DestType="$DestType") + create= merge= push= @@ -382,7 +405,7 @@ EOF # Enregistrer les changements _scripta "commit" <Init changelog & version $Version") +$(qvals git commit -m "Init changelog & version $Tag") EOF } diff --git a/bin/pdev b/bin/pdev index c0433e2..85106f0 100755 --- a/bin/pdev +++ b/bin/pdev @@ -31,8 +31,9 @@ Ce script va - pousser les branches modifiées}" ask_yesno "Voulez-vous continuer?" O || die - local script=".git/rel-merge.sh" + local script=".git/pman-merge.sh" local -a push_branches delete_branches + local after local comment= local or_die=" || exit 1" @@ -44,20 +45,32 @@ if [ -n "\$merge" ]; then esection "Fusionner la branche" EOF _mscript_merge_branch + after="AFTER_MERGE_${SrcType^^}"; [ -n "${!after}" ] && _scripta <=7.3", + "php": "^7.3 || 8.0.*", "phpunit/phpunit": "^9" }, "type": "library", + "extra": { + "branch-alias": { + "dev-pu9": "7.3.x-dev", + "dev-pu10": "8.1.x-dev" + } + }, "autoload": { "psr-4": { "nulib\\tests\\": "src" @@ -447,7 +453,7 @@ } ], "description": "fonctions et classes pour les tests", - "time": "2025-01-30T13:18:31+00:00" + "time": "2025-02-28T17:12:35+00:00" }, { "name": "phar-io/manifest", @@ -2015,7 +2021,8 @@ "platform-dev": { "ext-posix": "*", "ext-pcntl": "*", - "ext-curl": "*" + "ext-curl": "*", + "ext-sqlite3": "*" }, "plugin-api-version": "2.2.0" }