<pman>Intégration de la branche dev74
This commit is contained in:
commit
047ced704b
@ -13,13 +13,13 @@ NOAUTO=
|
|||||||
|
|
||||||
AFTER_CREATE_RELEASE='
|
AFTER_CREATE_RELEASE='
|
||||||
set -x
|
set -x
|
||||||
pcomp-select-profile.php dist
|
pcomp-select_profile.php dist
|
||||||
git commit -am "<pman>deps de dist"
|
git commit -am "<pman>deps de dist"
|
||||||
true
|
true
|
||||||
'
|
'
|
||||||
AFTER_MERGE_RELEASE='
|
AFTER_MERGE_RELEASE='
|
||||||
set -x
|
set -x
|
||||||
pcomp-select-profile.php dev
|
pcomp-select_profile.php dev
|
||||||
git commit -am "<pman>deps de dev"
|
git commit -am "<pman>deps de dev"
|
||||||
true
|
true
|
||||||
'
|
'
|
||||||
|
|||||||
@ -1,3 +1,9 @@
|
|||||||
|
## Release 0.7.1p74 du 22/10/2025-18:53
|
||||||
|
|
||||||
|
## Release 0.7.0p74 du 22/10/2025-18:52
|
||||||
|
|
||||||
|
* maj nulib/base-0.7.0
|
||||||
|
|
||||||
## Release 0.6.0p82 du 30/05/2025-23:29
|
## Release 0.6.0p82 du 30/05/2025-23:29
|
||||||
|
|
||||||
## Release 0.6.0p74 du 30/05/2025-23:18
|
## Release 0.6.0p74 du 30/05/2025-23:18
|
||||||
|
|||||||
25
README.md
25
README.md
@ -9,12 +9,19 @@ Avant de faire une release majeure sur nulib/phpss, faire d'abord la release
|
|||||||
majeure correspondante sur
|
majeure correspondante sur
|
||||||
* nulib/base
|
* nulib/base
|
||||||
|
|
||||||
|
Ouvrir deux consoles
|
||||||
|
* console "74" avec le checkout de la version php7.4
|
||||||
|
* console "82" avec le checkout de la version php8.2
|
||||||
|
|
||||||
~~~sh
|
~~~sh
|
||||||
|
## dans les deux consoles
|
||||||
|
|
||||||
version=0.6.0
|
version=0.6.0
|
||||||
|
|
||||||
major="${version%.*}.0"
|
major="${version%.*}.0"
|
||||||
|
|
||||||
## branche dev74
|
## console 74
|
||||||
|
|
||||||
git checkout dev74
|
git checkout dev74
|
||||||
|
|
||||||
sed -ri "\
|
sed -ri "\
|
||||||
@ -27,7 +34,10 @@ prel -v$version
|
|||||||
# en cas de conflit, sélectionner HEAD
|
# en cas de conflit, sélectionner HEAD
|
||||||
_merge82
|
_merge82
|
||||||
|
|
||||||
## branche dev82
|
## console 82
|
||||||
|
|
||||||
|
pu
|
||||||
|
|
||||||
git checkout dev82
|
git checkout dev82
|
||||||
|
|
||||||
sed -ri "\
|
sed -ri "\
|
||||||
@ -40,10 +50,21 @@ prel -C
|
|||||||
commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" &&
|
commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" &&
|
||||||
echo "commit=$commit"
|
echo "commit=$commit"
|
||||||
|
|
||||||
|
## console 74
|
||||||
|
|
||||||
|
# reprendre la valeur affichée par la précédente commande
|
||||||
|
commit=XXX
|
||||||
|
|
||||||
|
pu
|
||||||
|
|
||||||
git checkout dev74
|
git checkout dev74
|
||||||
|
|
||||||
git cherry-pick "$commit"
|
git cherry-pick "$commit"
|
||||||
pp -a
|
pp -a
|
||||||
|
|
||||||
|
## console 82
|
||||||
|
|
||||||
|
pu
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
-*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary
|
-*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary
|
||||||
@ -1 +1 @@
|
|||||||
0.6.0
|
0.7.1
|
||||||
|
|||||||
1466
composer.lock
generated
1466
composer.lock
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user