Compare commits

...

31 Commits
v0.9.0 ... main

Author SHA1 Message Date
Johannes Meyer
ac844e6464 composer.json: Raise ipl/orm requirement 2025-07-14 13:53:18 +02:00
Johannes Meyer
2afd0f67eb Update README.md 2025-05-22 13:18:57 +02:00
Johannes Meyer
84c91fbac0 composer.json: Raise ipl-web requirement 2025-05-22 12:57:40 +02:00
Johannes Meyer
3e895ee7e6 RELEASE.md: Update docker example 2025-05-22 11:25:22 +02:00
Johannes Meyer
7b1ea02863 Remove patch for ramsey/collection
It's obsolte now since the raise to PHP 8.2
2025-05-21 13:15:39 +02:00
Johannes Meyer
ce45fede7e Raise required PHP version to 8.2 2025-05-21 13:15:29 +02:00
Johannes Meyer
ca92d8e26e composer.json: Raise required versions 2024-07-15 09:51:48 +02:00
Johannes Meyer
611ca4161b make-release.sh: Properly handle file names with whitespace 2023-12-13 16:24:13 +01:00
Johannes Meyer
42dff4b0f6
Merge pull request #25 from Icinga/fix-autoloading
Fix autoloading
2023-10-27 09:47:10 +02:00
Johannes Meyer
b89aa9dfab Transfer ramsey/collection patch from icinga-php-thirdparty 2023-10-27 09:43:48 +02:00
Johannes Meyer
65a24000de Revert "Merge pull request #22 from Icinga/avoid-child-dependency-installs"
This reverts commit 71c4555ff2a5cceecb6e4b23bb5b3354c22c7444, reversing
changes made to 435e443a4122da64f92baaa054d65c36bebab77f.
2023-10-27 09:26:48 +02:00
Johannes Meyer
71c4555ff2
Merge pull request #22 from Icinga/avoid-child-dependency-installs
Avoid child dependency installs
2023-10-19 16:46:12 +02:00
Johannes Meyer
666262b018 Make sure no release contains thirdparty libraries 2023-10-19 16:43:02 +02:00
Johannes Meyer
7330e414a6 Add metapackage to avoid child dependency installs 2023-10-19 16:42:37 +02:00
Johannes Meyer
435e443a41 Require latest ipl releases 2023-09-21 11:41:57 +02:00
Johannes Meyer
51a905fcfe make-snapshot.sh: Don't override config.platform of composer.json 2023-08-04 08:41:11 +02:00
Johannes Meyer
2f5fc7ea9d composer.json: Raise php platform requirement..
..to what icinga-php-thirdparty requires
2023-08-04 08:18:44 +02:00
Johannes Meyer
7610682215 Require ipl-web v0.8.0 2023-05-15 10:38:20 +02:00
Johannes Meyer
77c423f41c Require latest ipl releases 2023-03-22 11:00:10 +01:00
Yonas Habteab
1aa0681e0f Require ipl\scheduler 2023-03-21 17:38:01 +01:00
Johannes Meyer
e5ef360ca4 default branch name is now main everywhere 2023-03-21 17:34:44 +01:00
Johannes Meyer
28bc9342a5 create-snapshot: Upgrade actions/checkout 2023-03-01 09:16:19 +01:00
Johannes Meyer
e13e8de224 create-snapshot: Run at 18 o'clock 2023-03-01 09:15:19 +01:00
Johannes Meyer
5b2f19db5e make-snapshot.sh: Make sure ipl parts are properly updated 2023-03-01 09:09:48 +01:00
Eric Lippmann
5e038a1d56
export-ignore: Fix typo 2023-01-24 15:18:12 +01:00
Johannes Meyer
ec69390abd Require ipl-sql v0.6.0 2022-12-13 15:08:54 +01:00
Johannes Meyer
43db4ed1b9 Raise version to 0.10.1 2022-12-13 15:04:30 +01:00
Eric Lippmann
ee11cd45f0 Export ignore
Remove Git-related files, `bin/` and `RELEASE.md` from archives.
2022-12-12 09:00:56 +01:00
Johannes Meyer
58eee4d45e Require latest ipl-web release 2022-09-05 13:54:11 +02:00
Johannes Meyer
e41703b420 Update README 2022-07-06 13:59:53 +02:00
Johannes Meyer
5f5afe1540 RELEASE.md: Update dev-docker example command 2022-07-06 10:57:48 +02:00
7 changed files with 45 additions and 37 deletions

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
.git* export-ignore
bin/ export-ignore
RELEASE.md export-ignore

View File

@ -2,8 +2,8 @@ name: Create Snapshot
on: on:
schedule: schedule:
# Every day at 4pm # Every day at 6pm
- cron: "0 16 * * *" - cron: "0 18 * * *"
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -14,7 +14,7 @@ jobs:
steps: steps:
- name: Checkout code base - name: Checkout code base
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0

View File

@ -5,13 +5,14 @@ This project bundles all Icinga PHP libraries into one piece and can be integrat
## Requirements ## Requirements
* [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.9) * [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.9)
* PHP (>= 7.2) * PHP (>= 8.2)
## Bundled Parts ## Bundled Parts
* [ipl-html](https://github.com/Icinga/ipl-html) * [ipl-html](https://github.com/Icinga/ipl-html)
* [ipl-i18n](https://github.com/Icinga/ipl-i18n) * [ipl-i18n](https://github.com/Icinga/ipl-i18n)
* [ipl-orm](https://github.com/Icinga/ipl-orm) * [ipl-orm](https://github.com/Icinga/ipl-orm)
* [ipl-scheduler](https://github.com/Icinga/ipl-scheduler)
* [ipl-sql](https://github.com/Icinga/ipl-sql) * [ipl-sql](https://github.com/Icinga/ipl-sql)
* [ipl-stdlib](https://github.com/Icinga/ipl-stdlib) * [ipl-stdlib](https://github.com/Icinga/ipl-stdlib)
* [ipl-validator](https://github.com/Icinga/ipl-validator) * [ipl-validator](https://github.com/Icinga/ipl-validator)
@ -24,8 +25,8 @@ path for Icinga Web 2 installations is: `/usr/share/icinga-php`
Download or clone this repository there (e.g. `/usr/share/icinga-php/ipl`) and you're done. Download or clone this repository there (e.g. `/usr/share/icinga-php/ipl`) and you're done.
> **Note**: Do NOT install the GIT master, it will not work! Checking out a > **Note**: Do NOT use the default branch, it will not work! Checking out a
> branch like `stable/0.9.0` or a tag like `v0.9.0` is fine. > branch like `stable/0.16.0` or a tag like `v0.16.0` is fine.
### Examples ### Examples
@ -33,7 +34,7 @@ Download or clone this repository there (e.g. `/usr/share/icinga-php/ipl`) and y
```sh ```sh
INSTALL_PATH="/usr/share/icinga-php/ipl" INSTALL_PATH="/usr/share/icinga-php/ipl"
INSTALL_VERSION="v0.9.0" INSTALL_VERSION="v0.16.0"
mkdir "$INSTALL_PATH" \ mkdir "$INSTALL_PATH" \
&& wget -q "https://github.com/Icinga/icinga-php-library/archive/$INSTALL_VERSION.tar.gz" -O - \ && wget -q "https://github.com/Icinga/icinga-php-library/archive/$INSTALL_VERSION.tar.gz" -O - \
| tar xfz - -C "$INSTALL_PATH" --strip-components 1 | tar xfz - -C "$INSTALL_PATH" --strip-components 1
@ -43,6 +44,6 @@ mkdir "$INSTALL_PATH" \
``` ```
INSTALL_PATH="/usr/share/icinga-php/ipl" INSTALL_PATH="/usr/share/icinga-php/ipl"
INSTALL_VERSION="stable/0.9.0" INSTALL_VERSION="stable/0.16.0"
git clone https://github.com/Icinga/icinga-php-library.git "$INSTALL_PATH" --branch "$INSTALL_VERSION" git clone https://github.com/Icinga/icinga-php-library.git "$INSTALL_PATH" --branch "$INSTALL_VERSION"
``` ```

View File

@ -8,4 +8,4 @@ e.g.
## Docker Example ## Docker Example
docker run -it -v $(pwd):/tmp/pwd -w /tmp/pwd -v $(realpath ~/.gitconfig):/tmp/user/.gitconfig -e "HOME=/tmp/user" -u $(id -u):$(id -g) dev-docker_web56 bin/make-release.sh 1.0.0 --no-tag docker run -it -v $(pwd):/tmp/pwd -w /tmp/pwd -v $(realpath ~/.gitconfig):/tmp/user/.gitconfig -e "HOME=/tmp/user" -u $(id -u):$(id -g) dev-docker_web82 bin/make-release.sh 1.0.0 --no-tag

View File

@ -35,15 +35,15 @@ rm -rf asset vendor
rm -f composer.lock rm -f composer.lock
composer install --no-scripts || fail "composer install failed" composer install --no-scripts || fail "composer install failed"
composer run-script post-update-cmd -- copy-assets composer run-script post-update-cmd -- copy-assets
find vendor/ -type f -name "*.php" \ find vendor/ -type f -name "*.php" -print0 \
| grep -v '/examples/' \ | grep -z -v '/examples/' \
| grep -v '/example/' \ | grep -z -v '/example/' \
| grep -v '/tests/' \ | grep -z -v '/tests/' \
| grep -v '/test/' \ | grep -z -v '/test/' \
| xargs -L1 git add -f | xargs -0 -L1 git add -f
find vendor/ -type f -name LICENSE | xargs -L1 git add -f find vendor/ -type f -name LICENSE -print0 | xargs -0 -L1 git add -f
find vendor/ -type f -name '*.json' | xargs -L1 git add -f find vendor/ -type f -name '*.json' -print0 | xargs -0 -L1 git add -f
find asset/ -type f | xargs -L1 git add -f find asset/ -type f -print0 | xargs -0 -L1 git add -f
echo "v$VERSION" > VERSION echo "v$VERSION" > VERSION
git add VERSION git add VERSION
git add composer.lock -f git add composer.lock -f

View File

@ -21,16 +21,19 @@ fi
git checkout -b $BRANCH git checkout -b $BRANCH
git merge --no-ff -m "Merge latest tag, to make it reachable for git-describe" $LATEST_TAG git merge --no-ff -m "Merge latest tag, to make it reachable for git-describe" $LATEST_TAG
composer config platform.php $PHP_VERSION composer config minimum-stability dev
composer require --no-update \ composer config prefer-stable true
php:$PHP_VERSION \
ipl/html:"dev-master as 99.x-dev" \
ipl/i18n:"dev-master as 99.x-dev" \
ipl/orm:"dev-master as 99.x-dev" \
ipl/sql:"dev-master as 99.x-dev" \
ipl/stdlib:"dev-master as 99.x-dev" \
ipl/validator:"dev-master as 99.x-dev" \
ipl/web:"dev-master as 99.x-dev"
git commit -a -m "Require dev-master everywhere" composer require --no-update \
php:">=$PHP_VERSION" \
ipl/html:"dev-main as 99.x-dev" \
ipl/i18n:"dev-main as 99.x-dev" \
ipl/orm:"dev-main as 99.x-dev" \
ipl/scheduler:"dev-main as 99.x-dev" \
ipl/sql:"dev-main as 99.x-dev" \
ipl/stdlib:"dev-main as 99.x-dev" \
ipl/validator:"dev-main as 99.x-dev" \
ipl/web:"dev-main as 99.x-dev"
git commit -a -m "Require dev-main everywhere"
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout

View File

@ -7,18 +7,19 @@
"config": { "config": {
"sort-packages": true, "sort-packages": true,
"platform": { "platform": {
"php": "7.2" "php": "8.2"
} }
}, },
"require": { "require": {
"php": ">=7.2", "php": ">=8.2",
"ipl/html": "^0.6.0", "ipl/html": "^0.8.0",
"ipl/i18n": "^0.2.0", "ipl/i18n": "^0.2.0",
"ipl/orm": "^0.4.0", "ipl/orm": "^0.7.0",
"ipl/sql": "^0.5.0", "ipl/scheduler": "^0.1.0",
"ipl/stdlib": "^0.12.0", "ipl/sql": "^0.7.0",
"ipl/validator": "^0.4.0", "ipl/stdlib": "^0.14.0",
"ipl/web": "^0.5.0" "ipl/validator": "^0.5.0",
"ipl/web": "^0.11.0"
}, },
"require-dev": { "require-dev": {
}, },