sda-php/nulib
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<pman>Intégration de la branche rel82-0.3.4

Browse Source
This commit is contained in:
Jephté Clain 2025-03-01 06:24:30 +04:00
commit cb86dd93bd
6 changed files with 110 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.md
View File

@ -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

2
VERSION.txt
View File

@ -1 +1 @@
0.3.2
0.3.4

29
bash/src/pman.sh
View File

@ -45,7 +45,7 @@ $0 !~ /<pman>/ { 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" <<EOF
$(qvals git commit -m "<pman>Init changelog & version $Version")
$(qvals git commit -m "<pman>Init changelog & version $Tag")
EOF
}

35
bin/pdev
View File

@ -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,10 +45,16 @@ if [ -n "\$merge" ]; then
esection "Fusionner la branche"
EOF
_mscript_merge_branch
after="AFTER_MERGE_${SrcType^^}"; [ -n "${!after}" ] && _scripta <<EOF
(
${!after}
)$or_die
EOF
_scripta <<EOF
fi
EOF
if [ -z "$ForbidDelete" ]; then
_scripta <<EOF
################################################################################
# delete
@ -55,9 +62,15 @@ if [ -n "\$delete" ]; then
esection "Supprimer la branche"
EOF
_mscript_delete_branch
after="AFTER_DELETE_${SrcType^^}"; [ -n "${!after}" ] && _scripta <<EOF
(
${!after}
)$or_die
EOF
_scripta <<EOF
fi
EOF
fi
_scripta <<EOF
################################################################################
@ -72,16 +85,23 @@ EOF
_script_push_branches
_scripta <<<fi
fi
after="AFTER_PUSH_${DestType^^}"; [ -n "${!after}" ] && _scripta <<EOF
(
${!after}
)$or_die
EOF
_scripta <<EOF
fi
EOF
[ -n "$Delete" -o "$ForbidDelete" ] && Deleted=1 || Deleted=
[ -n "$Push" -o "$ForbidPush" ] && Pushed=1 || Pushed=
[ -n "$Push" -o "$CantPush" ] && Pushed=1 || Pushed=
if [ -n "$_NoRunScript" ]; then
einfo "Veuillez consulter le script $script pour le détail des opérations à effectuer"
elif ! "$script" merge ${Delete:+delete} ${Push:+push}; then
eimportant "Veuillez consulter le script $script pour le détail des opérations qui n'ont pas pu êtres effectuées"
eimportant "\
Le script $script a été lancé avec les arguments 'merge${Delete:+ delete}${Push:+ push}'
Veuillez le consulter pour le détail des opérations qui n'ont pas pu êtres effectuées"
die
elif [ -n "$Deleted" -a -n "$Pushed" ]; then
[ -n "$_KeepScript" ] || rm "$script"
@ -91,7 +111,8 @@ EOF
./$script delete"
[ -n "$Pushed" ] || cmd="$cmd
./$script push"
einfo "Le script $script a été lancé avec les arguments 'merge${Delete:+ delete}${Push:+ push}'
einfo "\
Le script $script a été lancé avec les arguments 'merge${Delete:+ delete}${Push:+ push}'
Veuillez le consulter pour le détail des autres opérations à effectuer$cmd"
fi
}
@ -155,13 +176,13 @@ load_branches all
load_config "$MYNAME"
load_branches current "$1"
ForbidPush=
CantPush=
[ -n "$Origin" ] || Origin=origin
if ! git_have_remote "$Origin" && [ -n "$Push" ]; then
ewarn "L'option --no-push a été forcée puisque ce dépôt n'a pas d'origine"
ForbidPush=1
CantPush=1
fi
[ -n "$ForbidPush" ] && Push=
[ -n "$CantPush" ] && Push=
# puis faire l'action que l'on nous demande
case "$action" in

34
bin/prel
View File

@ -34,9 +34,11 @@ function ensure_branches() {
function create_release_action() {
if [ -n "$ReleaseBranch" ]; then
Version="${ReleaseBranch#$RELEASE}"
Tag="$TAG_PREFIX$Version$TAG_SUFFIX"
merge_release_action "$@"; return $?
elif [ -n "$HotfixBranch" ]; then
Version="${HotfixBranch#$HOTFIX}"
Tag="$TAG_PREFIX$Version$TAG_SUFFIX"
merge_hotfix_action "$@"; return $?
fi
@ -67,7 +69,7 @@ Vous devrez:
fi
ask_yesno "Voulez-vous continuer?" O || die
local script=".git/rel-release.sh"
local script=".git/pman-release.sh"
local -a push_branches push_tags
local comment=
local or_die=" || exit 1"
@ -80,6 +82,11 @@ if [ -n "\$create" ]; then
esection "Création de la release"
EOF
_rscript_create_release_branch
[ -n "$AFTER_CREATE_RELEASE" ] && _scripta <<EOF
(
$AFTER_CREATE_RELEASE
)$or_die
EOF
_scripta <<EOF
fi
EOF
@ -93,6 +100,11 @@ EOF
_rscript_merge_release_branch "$DestBranch" "$Tag"
_rscript_merge_release_branch "$SrcBranch"
_rscript_delete_release_branch
[ -n "$AFTER_MERGE_RELEASE" ] && _scripta <<EOF
(
$AFTER_MERGE_RELEASE
)$or_die
EOF
_scripta <<EOF
fi
EOF
@ -105,16 +117,23 @@ esection "Pousser branches et tags"
EOF
_script_push_branches
_script_push_tags
[ -n "$AFTER_PUSH_RELEASE" ] && _scripta <<EOF
(
$AFTER_PUSH_RELEASE
)$or_die
EOF
_scripta <<EOF
fi
EOF
[ -n "$Merge" ] && Merged=1 || Merged=
[ -n "$Push" -o "$ForbidPush" ] && Pushed=1 || Pushed=
[ -n "$Push" -o "$CantPush" ] && Pushed=1 || Pushed=
if [ -n "$_NoRunScript" ]; then
einfo "Veuillez consulter le script $script pour le détail des opérations à effectuer"
elif ! "$script" create ${Merge:+merge} ${Push:+push}; then
eimportant "Veuillez consulter le script $script pour le détail des opérations qui n'ont pas pu êtres effectuées"
eimportant "\
Le script $script a été lancé avec les arguments 'create${Merge:+ merge}${Push:+ push}'
Veuillez le consulter pour le détail des opérations qui n'ont pas pu êtres effectuées"
die
elif [ -n "$Merged" -a -n "$Pushed" ]; then
[ -n "$_KeepScript" ] || rm "$script"
@ -124,7 +143,8 @@ EOF
./$script merge"
[ -n "$Pushed" ] || cmd="$cmd
./$script push"
einfo "Le script $script a été lancé avec les arguments 'create${Merge:+ merge}${Push:+ push}'
einfo "\
Le script $script a été lancé avec les arguments 'create${Merge:+ merge}${Push:+ push}'
Veuillez le consulter pour le détail des autres opérations à effectuer$cmd"
fi
}
@ -209,13 +229,13 @@ if [ -n "$Merge" -a -n "$NOAUTO" ]; then
fi
[ -z "$Merge" ] && Push=
ForbidPush=
CantPush=
[ -n "$Origin" ] || Origin=origin
if ! git_have_remote "$Origin" && [ -n "$Push" ]; then
ewarn "L'option --no-push a été forcée puisque ce dépôt n'a pas d'origine"
ForbidPush=1
CantPush=1
fi
[ -n "$ForbidPush" ] && Push=
[ -n "$CantPush" ] && Push=
# puis faire l'action que l'on nous demande
case "$action" in

29
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ab280aa4a5f5c83fa488537530b29759",
"content-hash": "266a079e97f3ceecc2cc0a84d6b9743b",
"packages": [
{
"name": "symfony/deprecation-contracts",
@ -301,16 +301,16 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.12.1",
"version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
"reference": "024473a478be9df5fdaca2c793f2232fe788e414"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
"reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
"reference": "024473a478be9df5fdaca2c793f2232fe788e414",
"shasum": ""
},
"require": {
@ -349,7 +349,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
"source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
"source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
},
"funding": [
{
@ -357,7 +357,7 @@
"type": "tidelift"
}
],
"time": "2024-11-08T17:47:46+00:00"
"time": "2025-02-12T12:17:51+00:00"
},
{
"name": "nikic/php-parser",
@ -423,13 +423,19 @@
"source": {
"type": "git",
"url": "https://git.univ-reunion.fr/sda-php/nulib-tests.git",
"reference": "9b5c9c295c3dee6fc02ccddbd8a70bca797c8045"
"reference": "8f641d9a7cf6aba1453cb42ebd15951aa7002e1b"
},
"require": {
"php": ">=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"
}