From 1b188f29a10c37e7f86a231d994e807c2fd29cfb Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 28 Feb 2025 20:30:49 +0400 Subject: [PATCH 1/4] Init changelog & version 0.3.2 --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index c5910fa..c44f39f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,5 @@ +## Release 0.3.2p82 du 28/02/2025-20:30 + ## Release 0.3.2p74 du 28/02/2025-20:28 (tech) Migration vers pman From d3c2299c136e6e47f37fab3cf3a0f317e13e9e08 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 28 Feb 2025 21:16:00 +0400 Subject: [PATCH 2/4] maj deps --- composer.lock | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 04bbdc9..9fcac33 100644 --- a/composer.lock +++ b/composer.lock @@ -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" } From 2163ea992e20eecaf0bd857144520bb1b1ae340d Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 1 Mar 2025 06:14:00 +0400 Subject: [PATCH 3/4] script post release/merge --- bash/src/pman.sh | 29 ++++++++++++++++++++++++++--- bin/pdev | 18 +++++++++++++++++- bin/prel | 19 ++++++++++++++++++- 3 files changed, 61 insertions(+), 5 deletions(-) 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..c5624a3 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,6 +45,11 @@ if [ -n "\$merge" ]; then esection "Fusionner la branche" EOF _mscript_merge_branch + after="AFTER_MERGE_${SrcType^^}"; [ -n "${!after}" ] && _scripta < Date: Sat, 1 Mar 2025 06:14:58 +0400 Subject: [PATCH 4/4] Init changelog & version 0.3.3p74 --- CHANGES.md | 4 ++++ VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c44f39f..07fafda 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## Release 0.3.3p74 du 01/03/2025-06:14 + +* `2163ea9` script post release/merge + ## 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..1c09c74 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.3.2 +0.3.3