From 65a24000de820edb39aaa4bdd6888c2809536d98 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 27 Oct 2023 09:26:48 +0200 Subject: [PATCH] Revert "Merge pull request #22 from Icinga/avoid-child-dependency-installs" This reverts commit 71c4555ff2a5cceecb6e4b23bb5b3354c22c7444, reversing changes made to 435e443a4122da64f92baaa054d65c36bebab77f. --- .github/workflows/clean-vendor.yml | 26 -------------------------- bin/make-release.sh | 6 ------ composer.json | 9 ++------- replacer/composer.json | 18 ------------------ 4 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/clean-vendor.yml delete mode 100644 replacer/composer.json diff --git a/.github/workflows/clean-vendor.yml b/.github/workflows/clean-vendor.yml deleted file mode 100644 index 7e61e23..0000000 --- a/.github/workflows/clean-vendor.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Clean Vendor Check - -on: - push: - branches: - - stable/* - -jobs: - check-vendor: - name: Clean Vendor Check - runs-on: ubuntu-latest - - steps: - - name: Checkout code base - uses: actions/checkout@v3 - - - name: Check If Vendor Is Clean - run: | - files=`find vendor -maxdepth 1 -type d -not -name "ipl" -not -name "fortawesome" -not -name "composer" -not -name "vendor"` - if [ -z "$files" ]; then - echo "No unknown vendor files found"; - exit 0; - else - echo "Found unknown vendor files: $files"; - exit 1; - fi diff --git a/bin/make-release.sh b/bin/make-release.sh index 9395242..0cc9a6c 100755 --- a/bin/make-release.sh +++ b/bin/make-release.sh @@ -53,12 +53,6 @@ rm -rf vendor git checkout vendor composer validate --no-check-all --strict || fail "Composer validate failed" -UNKNOWN_VENDOR_FILES=$(find vendor -maxdepth 1 -type d -not -name "ipl" -not -name "fortawesome" -not -name "composer" -not -name "vendor") -if [ -n "$UNKNOWN_VENDOR_FILES" ]; then - echo "Unknown vendor files found! DO NOT TAG!" - exit 1 -fi - if [ -z "$NO_OPT" ]; then git tag -a v$VERSION -m "Version v$VERSION" echo "Finished, tagged v$VERSION" diff --git a/composer.json b/composer.json index 10b1e07..8cfce65 100644 --- a/composer.json +++ b/composer.json @@ -10,15 +10,8 @@ "php": "7.2.9" } }, - "repositories": [ - { - "type": "path", - "url": "./replacer" - } - ], "require": { "php": ">=7.2", - "repl/acer": "@dev", "ipl/html": "^0.8.0", "ipl/i18n": "^0.2.0", "ipl/orm": "^0.6.0", @@ -28,6 +21,8 @@ "ipl/validator": "^0.5.0", "ipl/web": "^0.9.0" }, + "require-dev": { + }, "autoload": { "psr-0": { "AssetLoader": "" } }, diff --git a/replacer/composer.json b/replacer/composer.json deleted file mode 100644 index 53f9cdf..0000000 --- a/replacer/composer.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "repl/acer", - "type": "metapackage", - "description": "Replaces third party packages as they are included in icinga-php-thirdparty", - "license": "MIT", - "replace": { - "psr/http-message": "*", - "guzzlehttp/psr7": "*", - "dragonmantank/cron-expression": "*", - "psr/log": "*", - "ramsey/uuid": "*", - "react/event-loop": "*", - "react/promise": "*", - "simshaun/recurr": "*", - "evenement/evenement": "*", - "wikimedia/less.php": "*" - } -}