Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
3e41a5d8a3 | |||
6fd59afb25 | |||
e68672917d |
@ -5,8 +5,8 @@ composer:
|
|||||||
dev:
|
dev:
|
||||||
link: true
|
link: true
|
||||||
require:
|
require:
|
||||||
nulib/php: ^8.2-dev
|
nulib/php: ^7.4-dev
|
||||||
dist:
|
dist:
|
||||||
link: false
|
link: false
|
||||||
require:
|
require:
|
||||||
nulib/php: ^0.5.0p82
|
nulib/php: ^0.5.0p74
|
||||||
|
14
.pman.conf
14
.pman.conf
@ -1,13 +1,13 @@
|
|||||||
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
|
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
|
||||||
|
|
||||||
UPSTREAM=dev74
|
UPSTREAM=
|
||||||
DEVELOP=dev82
|
DEVELOP=dev74
|
||||||
FEATURE=wip82/
|
FEATURE=wip74/
|
||||||
RELEASE=rel82-
|
RELEASE=rel74-
|
||||||
MAIN=dist82
|
MAIN=dist74
|
||||||
TAG_PREFIX=
|
TAG_PREFIX=
|
||||||
TAG_SUFFIX=p82
|
TAG_SUFFIX=p74
|
||||||
HOTFIX=hotf82-
|
HOTFIX=hotf74-
|
||||||
DIST=
|
DIST=
|
||||||
NOAUTO=
|
NOAUTO=
|
||||||
|
|
||||||
|
@ -4,5 +4,5 @@
|
|||||||
RUNPHP=
|
RUNPHP=
|
||||||
|
|
||||||
# Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies
|
# Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies
|
||||||
DIST=d12
|
DIST=d11
|
||||||
#REGISTRY=pubdocker.univ-reunion.fr/dist
|
#REGISTRY=pubdocker.univ-reunion.fr/dist
|
||||||
|
49
README.md
Normal file
49
README.md
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
# 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
|
@ -3,6 +3,10 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"description": "wrapper pour phpoffice/phpspreadsheet",
|
"description": "wrapper pour phpoffice/phpspreadsheet",
|
||||||
"repositories": [
|
"repositories": [
|
||||||
|
{
|
||||||
|
"type": "path",
|
||||||
|
"url": "../nulib"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "composer",
|
"type": "composer",
|
||||||
"url": "https://repos.univ-reunion.fr/composer"
|
"url": "https://repos.univ-reunion.fr/composer"
|
||||||
@ -15,12 +19,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"nulib/php": "^0.5.0p82",
|
"nulib/php": "^7.4-dev",
|
||||||
"phpoffice/phpspreadsheet": "^3.3.0",
|
"phpoffice/phpspreadsheet": "^1.0",
|
||||||
"php": "^8.2"
|
"php": "^7.4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"nulib/tests": "^8.2"
|
"nulib/tests": "^7.4"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
969
composer.lock
generated
969
composer.lock
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user