From e4cf4c5d875882c53b2c31d7a16e7d554f531ef7 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 26 Mar 2019 05:56:36 +0100 Subject: [PATCH] Prepare v0.2.0, add guzzlehttp/psr7 --- README.md | 32 +++++++++++++++++--------------- bin/make-release.sh | 10 ++++++---- composer.json | 20 ++++++++------------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index df72c9b..f8429dd 100644 --- a/README.md +++ b/README.md @@ -5,31 +5,33 @@ This module ships the new Icinga PHP library. Please download the latest release and install it like any other module. > **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 --------------------------- ```sh -RELEASES="https://github.com/Icinga/icingaweb2-module-ipl/archive" \ -&& MODULES_PATH="/usr/share/icingaweb2/modules" \ -&& MODULE_VERSION=0.1.1 \ -&& mkdir "$MODULES_PATH" \ -&& wget -q $RELEASES/v${MODULE_VERSION}.tar.gz -O - \ - | tar xfz - -C "$MODULES_PATH" --strip-components 1 -icingacli module enable ipl +MODULE_NAME=ipl +MODULE_VERSION=v0.2.0 +MODULES_PATH="/usr/share/icingaweb2/modules" +MODULE_PATH="${MODULES_PATH}/${MODULE_PATH}" +RELEASES="https://github.com/Icinga/icingaweb2-module-${MODULE_NAME}/archive" +mkdir "$MODULE_PATH" \ +&& wget -q $RELEASES/${MODULE_VERSION}.tar.gz -O - \ + | tar xfz - -C "$MODULE_PATH" --strip-components 1 +icingacli module enable "${MODULE_NAME}" ``` Sample GIT installation ----------------------- ```sh -REPO="https://github.com/Icinga/icingaweb2-module-ipl" \ -&& MODULES_PATH="/usr/share/icingaweb2/modules" \ -&& MODULE_VERSION=0.1.1 \ -&& mkdir -p "$MODULES_PATH" \ -&& git clone ${REPO} "${MODULES_PATH}/ipl" --branch v${MODULE_VERSION} -icingacli module enable ipl +MODULE_NAME=ipl +MODULE_VERSION=v0.2.0 +REPO="https://github.com/Icinga/icingaweb2-module-${MODULE_NAME}" +MODULES_PATH="/usr/share/icingaweb2/modules" +git clone ${REPO} "${MODULES_PATH}/${MODULE_NAME}" --branch "${MODULE_VERSION}" +icingacli module enable "${MODULE_NAME}" ``` Developer Documentation @@ -45,4 +47,4 @@ Developer Documentation e.g. - ./bin/make-release.sh 0.1.0 + ./bin/make-release.sh 0.2.0 diff --git a/bin/make-release.sh b/bin/make-release.sh index 0e2b31b..6f39b0a 100755 --- a/bin/make-release.sh +++ b/bin/make-release.sh @@ -2,7 +2,7 @@ VERSION="$1" -if [ -z $VERSION ]; then +if [[ -z $VERSION ]]; then echo "USAGE: $0 " echo " e.g.: $0 0.1.0" exit 1 @@ -10,7 +10,7 @@ fi TAG=$(git tag | grep -c "$VERSION") -if [ "$TAG" -ne "0" ]; then +if [[ "$TAG" -ne "0" ]]; then echo -n "Version $VERSION has already been tagged: " git tag | grep "$VERSION" exit 1 @@ -27,8 +27,10 @@ find vendor/ -type f -name "*.php" \ | grep -v '/example/' \ | grep -v '/tests/' \ | grep -v '/test/' \ - | xargs -l git add -f -find vendor/ -type f -name LICENSE | xargs -l git add -f + | xargs 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" rm -f composer.lock diff --git a/composer.json b/composer.json index dba4a2f..162a19f 100644 --- a/composer.json +++ b/composer.json @@ -3,26 +3,22 @@ "type": "project", "homepage": "https://github.com/Icinga/icingaweb2-module-ipl", "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "5.6.3" + } }, "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", "url": "https://github.com/Icinga/ipl-sql", "no-api":true }], "require": { "php": ">=5.4.0", - "ipl/stdlib": "dev-master", - "ipl/html": "dev-master", - "ipl/sql": "dev-master" + "guzzlehttp/psr7": "^1.5", + "ipl/html": "^0.1", + "ipl/sql": "dev-master", + "ipl/stdlib": "^0.1" }, "require-dev": { }