Compare commits

..

25 Commits

Author SHA1 Message Date
620e1b8eab <pman>Intégration de la branche rel82-0.5.0 2025-04-30 04:48:34 +04:00
291da468c9 <pman>deps de dist 2025-04-30 04:48:34 +04:00
893f321e6f <pman>Init changelog & version 0.5.0p82 2025-04-30 04:48:26 +04:00
6325f05f37 <pman>Intégration de la branche dev74 2025-04-30 04:47:33 +04:00
e06fa96a22 <pman>Intégration de la branche dev74 2025-03-23 08:22:50 +04:00
df916ff29b <pman>deps de dev 2025-03-14 15:30:22 +04:00
44b6507d02 <pman>Intégration de la branche rel82-0.4.0 2025-03-14 15:30:18 +04:00
c1be1ee95a <pman>Intégration de la branche rel82-0.4.0 2025-03-14 15:30:18 +04:00
e55f2c15fc <pman>deps de dist 2025-03-14 15:30:18 +04:00
6943a14944 <pman>Init changelog & version 0.4.0p82 2025-03-14 15:30:05 +04:00
1205b61cff <pman>Intégration de la branche dev74 2025-03-14 15:29:12 +04:00
5e337a3967 <pman>Intégration de la branche dev74 2025-03-04 12:47:56 +04:00
7c6d599adf <pman>Intégration de la branche dev74 2025-03-04 12:40:18 +04:00
dff61fe6f0 <pman>Intégration de la branche dev74 2025-03-02 19:21:44 +04:00
01cc8a3428 maj deps 8.2 2025-03-02 15:37:50 +04:00
bef92989c8 Intégration de la branche dev74 2025-03-02 15:37:25 +04:00
3dad20558a <pman>deps de dev 2025-03-01 13:26:41 +04:00
f8929f0bc3 <pman>Intégration de la branche rel82-0.3.0 2025-03-01 13:25:12 +04:00
edf280abef <pman>Intégration de la branche rel82-0.3.0 2025-03-01 13:25:12 +04:00
3605b386ce maj deps 2025-03-01 13:25:05 +04:00
9555ea7004 <pman>Init changelog & version 0.3.0p82 2025-03-01 13:24:30 +04:00
93e344953f <pman>deps de dev 2025-03-01 13:23:55 +04:00
797496612a <pman>Intégration de la branche dev74 2025-03-01 13:19:57 +04:00
89bce4d03f <pman>deps de dist 2025-03-01 13:15:14 +04:00
3c51b0ebee maj deps php8.2 2025-03-01 13:14:00 +04:00
6 changed files with 328 additions and 710 deletions

View File

@ -5,8 +5,8 @@ composer:
dev:
link: true
require:
nulib/php: ^7.4-dev
nulib/php: ^8.2-dev
dist:
link: false
require:
nulib/php: ^0.5.0p74
nulib/php: ^0.5.0p82

View File

@ -1,13 +1,13 @@
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
UPSTREAM=
DEVELOP=dev74
FEATURE=wip74/
RELEASE=rel74-
MAIN=dist74
UPSTREAM=dev74
DEVELOP=dev82
FEATURE=wip82/
RELEASE=rel82-
MAIN=dist82
TAG_PREFIX=
TAG_SUFFIX=p74
HOTFIX=hotf74-
TAG_SUFFIX=p82
HOTFIX=hotf82-
DIST=
NOAUTO=

View File

@ -4,5 +4,5 @@
RUNPHP=
# Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies
DIST=d11
DIST=d12
#REGISTRY=pubdocker.univ-reunion.fr/dist

View File

@ -1,49 +0,0 @@
# nulib-phpss
## Release
Exemple: release de la version 0.6.0
Avant de faire une release majeure sur nulib/phpss, faire d'abord la release
majeure correspondante sur
* nulib/php
~~~sh
version=0.6.0
major="${version%.*}.0"
## branche dev74
git checkout dev74
sed -ri "\
/nulib\/.*:/s/[0-9]+.[0-9]+.0p74/${major}p74/
" .composer.pman.yml
pci "maj projet"
prel -v$version
# en cas de conflit, sélectionner HEAD
_merge82
## branche dev82
git checkout dev82
sed -ri "\
/nulib\/.*:/s/[0-9]+.[0-9]+.0p82/${major}p82/
" .composer.pman.yml
pci "maj projet"
prel -C
commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" &&
echo "commit=$commit"
git checkout dev74
git cherry-pick "$commit"
pp -a
~~~
-*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary

View File

@ -3,10 +3,6 @@
"type": "library",
"description": "wrapper pour phpoffice/phpspreadsheet",
"repositories": [
{
"type": "path",
"url": "../nulib"
},
{
"type": "composer",
"url": "https://repos.univ-reunion.fr/composer"
@ -19,12 +15,12 @@
}
},
"require": {
"nulib/php": "^7.4-dev",
"phpoffice/phpspreadsheet": "^1.0",
"php": "^7.4"
"nulib/php": "^0.5.0p82",
"phpoffice/phpspreadsheet": "^3.3.0",
"php": "^8.2"
},
"require-dev": {
"nulib/tests": "^7.4"
"nulib/tests": "^8.2"
},
"autoload": {
"psr-4": {

955
composer.lock generated

File diff suppressed because it is too large Load Diff