Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d843ef4600 | |||
| 07905486fa | |||
| 0d59493378 | |||
| ed1fd2c441 |
@ -1,3 +1,5 @@
|
|||||||
|
## Release 0.7.1p82 du 22/10/2025-18:44
|
||||||
|
|
||||||
## Release 0.7.1p74 du 22/10/2025-18:40
|
## Release 0.7.1p74 du 22/10/2025-18:40
|
||||||
|
|
||||||
## Release 0.7.0p74 du 22/10/2025-18:38
|
## Release 0.7.0p74 du 22/10/2025-18:38
|
||||||
|
|||||||
25
README.md
25
README.md
@ -9,12 +9,19 @@ Avant de faire une release majeure sur nulib/spout, 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
|
||||||
@ -3,6 +3,10 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"description": "wrapper pour openspout/openspout",
|
"description": "wrapper pour openspout/openspout",
|
||||||
"repositories": [
|
"repositories": [
|
||||||
|
{
|
||||||
|
"type": "path",
|
||||||
|
"url": "../nulib-base"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "composer",
|
"type": "composer",
|
||||||
"url": "https://repos.univ-reunion.fr/composer"
|
"url": "https://repos.univ-reunion.fr/composer"
|
||||||
@ -18,7 +22,7 @@
|
|||||||
"openspout/openspout": "v3.7.4"
|
"openspout/openspout": "v3.7.4"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"nulib/base": "^0.7.0p74",
|
"nulib/base": "^7.4-dev",
|
||||||
"ext-dom": "*",
|
"ext-dom": "*",
|
||||||
"ext-filter": "*",
|
"ext-filter": "*",
|
||||||
"ext-libxml": "*",
|
"ext-libxml": "*",
|
||||||
|
|||||||
20
composer.lock
generated
20
composer.lock
generated
@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "3c80dbef1c7d8d198e964d9609edc7b4",
|
"content-hash": "4b1bf3aaf4bdf244af9886995daa16f5",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "dflydev/dot-access-data",
|
"name": "dflydev/dot-access-data",
|
||||||
@ -420,11 +420,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nulib/base",
|
"name": "nulib/base",
|
||||||
"version": "0.7.0p74",
|
"version": "dev-dev74",
|
||||||
"source": {
|
"dist": {
|
||||||
"type": "git",
|
"type": "path",
|
||||||
"url": "https://git.univ-reunion.fr/sda-php/nulib-base.git",
|
"url": "../nulib-base",
|
||||||
"reference": "64ab6c70e4f089c43714ec3d38dab7161aeb2b0d"
|
"reference": "b6d53059a3dc39d0aa9d4492c362e9f1d1cce16e"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
@ -482,7 +482,9 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "fonctions et classes essentielles",
|
"description": "fonctions et classes essentielles",
|
||||||
"time": "2025-10-22T14:34:02+00:00"
|
"transport-options": {
|
||||||
|
"relative": true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpmailer/phpmailer",
|
"name": "phpmailer/phpmailer",
|
||||||
@ -5598,7 +5600,9 @@
|
|||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"stability-flags": [],
|
"stability-flags": {
|
||||||
|
"nulib/base": 20
|
||||||
|
},
|
||||||
"prefer-stable": false,
|
"prefer-stable": false,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user