From 3fc5f4498a499985e1311539299c328a797dea76 Mon Sep 17 00:00:00 2001 From: asrar Date: Sun, 28 Jan 2024 11:16:48 +0100 Subject: [PATCH] ci: Fix deps + check on lowest deps --- .github/workflows/ci.yml | 11 +++-------- composer.json | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fde9498..78dbfd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,6 @@ jobs: dependencies: - "lowest" - "highest" - exclude: - # Exclude lowest deps version as they don't support newer php versions - - dependencies: "lowest" - php-version: "8.3" - - dependencies: "lowest" - php-version: "8.2" - - dependencies: "lowest" - php-version: "8.1" steps: - name: "Checkout" @@ -48,6 +40,9 @@ jobs: run: "vendor/bin/phpunit -c phpunit.xml.dist" - name: Upload coverage results to Coveralls + # skip php-coversalls for lowest deps + # it fails on lowest depedencies because old versions of guzzle doesn't work well with newer php versions + if: "${{ 'highest' == matrix.dependencies }}" env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/composer.json b/composer.json index 7731a0e..e6a4807 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ "require": { "php": "^7.4 || ^8.0", "doctrine/dbal": "^3.0", - "doctrine/inflector": "^1.0 || ^2.0" + "doctrine/inflector": "^2.0" }, "require-dev": { "phpunit/phpunit": "^10.2", - "php-coveralls/php-coveralls": "^2.0.0" + "php-coveralls/php-coveralls": "^2.7.0" }, "autoload": { "psr-4": { @@ -28,10 +28,5 @@ } }, "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - } + "prefer-stable": true }