Prepare v0.2.0, add guzzlehttp/psr7

This commit is contained in:
Thomas Gelf 2019-03-26 05:56:36 +01:00
parent e4f0b6aea0
commit e4cf4c5d87
3 changed files with 31 additions and 31 deletions

View File

@ -5,31 +5,33 @@ This module ships the new Icinga PHP library. Please download the latest
release and install it like any other module. release and install it like any other module.
> **HINT**: Do NOT install the GIT master, it will not work! Checking out a > **HINT**: Do NOT install the GIT master, it will not work! Checking out a
> branch like `stable/0.1.1` or a tag like `v0.1.1` is fine. > branch like `stable/0.2.0` or a tag like `v0.2.0` is fine.
Sample Tarball installation Sample Tarball installation
--------------------------- ---------------------------
```sh ```sh
RELEASES="https://github.com/Icinga/icingaweb2-module-ipl/archive" \ MODULE_NAME=ipl
&& MODULES_PATH="/usr/share/icingaweb2/modules" \ MODULE_VERSION=v0.2.0
&& MODULE_VERSION=0.1.1 \ MODULES_PATH="/usr/share/icingaweb2/modules"
&& mkdir "$MODULES_PATH" \ MODULE_PATH="${MODULES_PATH}/${MODULE_PATH}"
&& wget -q $RELEASES/v${MODULE_VERSION}.tar.gz -O - \ RELEASES="https://github.com/Icinga/icingaweb2-module-${MODULE_NAME}/archive"
| tar xfz - -C "$MODULES_PATH" --strip-components 1 mkdir "$MODULE_PATH" \
icingacli module enable ipl && wget -q $RELEASES/${MODULE_VERSION}.tar.gz -O - \
| tar xfz - -C "$MODULE_PATH" --strip-components 1
icingacli module enable "${MODULE_NAME}"
``` ```
Sample GIT installation Sample GIT installation
----------------------- -----------------------
```sh ```sh
REPO="https://github.com/Icinga/icingaweb2-module-ipl" \ MODULE_NAME=ipl
&& MODULES_PATH="/usr/share/icingaweb2/modules" \ MODULE_VERSION=v0.2.0
&& MODULE_VERSION=0.1.1 \ REPO="https://github.com/Icinga/icingaweb2-module-${MODULE_NAME}"
&& mkdir -p "$MODULES_PATH" \ MODULES_PATH="/usr/share/icingaweb2/modules"
&& git clone ${REPO} "${MODULES_PATH}/ipl" --branch v${MODULE_VERSION} git clone ${REPO} "${MODULES_PATH}/${MODULE_NAME}" --branch "${MODULE_VERSION}"
icingacli module enable ipl icingacli module enable "${MODULE_NAME}"
``` ```
Developer Documentation Developer Documentation
@ -45,4 +47,4 @@ Developer Documentation
e.g. e.g.
./bin/make-release.sh 0.1.0 ./bin/make-release.sh 0.2.0

View File

@ -2,7 +2,7 @@
VERSION="$1" VERSION="$1"
if [ -z $VERSION ]; then if [[ -z $VERSION ]]; then
echo "USAGE: $0 <version>" echo "USAGE: $0 <version>"
echo " e.g.: $0 0.1.0" echo " e.g.: $0 0.1.0"
exit 1 exit 1
@ -10,7 +10,7 @@ fi
TAG=$(git tag | grep -c "$VERSION") TAG=$(git tag | grep -c "$VERSION")
if [ "$TAG" -ne "0" ]; then if [[ "$TAG" -ne "0" ]]; then
echo -n "Version $VERSION has already been tagged: " echo -n "Version $VERSION has already been tagged: "
git tag | grep "$VERSION" git tag | grep "$VERSION"
exit 1 exit 1
@ -27,8 +27,10 @@ find vendor/ -type f -name "*.php" \
| grep -v '/example/' \ | grep -v '/example/' \
| grep -v '/tests/' \ | grep -v '/tests/' \
| grep -v '/test/' \ | grep -v '/test/' \
| xargs -l git add -f | xargs git add -f
find vendor/ -type f -name LICENSE | xargs -l git add -f find vendor/ -type f -name LICENSE | xargs git add -f
sed -i '' "s/^Version:.*/Version: v$VERSION/" module.info
git add module.info
git commit -m "Version v$VERSION" git commit -m "Version v$VERSION"
rm -f composer.lock rm -f composer.lock

View File

@ -3,26 +3,22 @@
"type": "project", "type": "project",
"homepage": "https://github.com/Icinga/icingaweb2-module-ipl", "homepage": "https://github.com/Icinga/icingaweb2-module-ipl",
"config": { "config": {
"sort-packages": true "sort-packages": true,
"platform": {
"php": "5.6.3"
}
}, },
"repositories": [{ "repositories": [{
"type": "vcs",
"url": "https://github.com/Icinga/ipl-stdlib",
"no-api":true
}, {
"type": "vcs",
"url": "https://github.com/Icinga/ipl-html",
"no-api":true
}, {
"type": "vcs", "type": "vcs",
"url": "https://github.com/Icinga/ipl-sql", "url": "https://github.com/Icinga/ipl-sql",
"no-api":true "no-api":true
}], }],
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"ipl/stdlib": "dev-master", "guzzlehttp/psr7": "^1.5",
"ipl/html": "dev-master", "ipl/html": "^0.1",
"ipl/sql": "dev-master" "ipl/sql": "dev-master",
"ipl/stdlib": "^0.1"
}, },
"require-dev": { "require-dev": {
} }