diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d21034b..7ffbd13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: - operating_system: ubuntu-latest postgres: '13' php_versions: '8.0' - laravel: '^8.0' + laravel: '^9.0' experimental: false coverage: false runs-on: '${{ matrix.operating_system }}' @@ -176,14 +176,11 @@ jobs: composer.json.sample > composer.json composer create-project --prefer-dist laravel/laravel:${{ matrix.laravel }} release rm -rf release/database/migrations - rm release/composer.json rm release/.env rm -rf release/tests - cp composer.json release/composer.json cp -rf database/new_migrations release/database/migrations cp .env release/.env - cd release && COMPOSER_MEMORY_LIMIT=-1 composer update - cd ../../ + cd ../ sed -e "s/\${USERNAME}/${{ env.DB_USER }}/" \ -e "s/\${PASSWORD}/${{ env.DB_PASSWORD }}/" \ -e "s/\${DATABASE}/${{ env.DB_NAME }}/" \ diff --git a/composer.json b/composer.json index 128ecd8..0635068 100644 --- a/composer.json +++ b/composer.json @@ -36,14 +36,14 @@ }, "require": { "php": "^7.3|^7.4|^8.0", - "illuminate/support": "^5.7|^6.20|^7.30|^8.20", - "illuminate/database": "^5.7|^6.20|^7.30|^8.20", - "illuminate/console": "^5.7|^6.20|^7.30|^8.20" + "illuminate/support": "^5.7|^6.20|^7.30|^8.20|^9.0", + "illuminate/database": "^5.7|^6.20|^7.30|^8.20|^9.0", + "illuminate/console": "^5.7|^6.20|^7.30|^8.20|^9.0" }, "require-dev": { "phpunit/phpunit": "^7.3|^8.5|^9.4", "php-mock/php-mock": "^2.0", - "orchestra/testbench": "^3.8|^4.8|^5.7|^6.2", + "orchestra/testbench": "^3.8|^4.8|^5.7|^6.2|^7.0", "umbrellio/code-style-php": "^1.0", "laravel/legacy-factories": "^1.0", "php-coveralls/php-coveralls": "^2.1", diff --git a/tests.sh b/tests.sh index 8819fe7..a9f3f0c 100755 --- a/tests.sh +++ b/tests.sh @@ -10,20 +10,20 @@ sed -e "s/\${USERNAME}/postgres/" \ -e "s/\${HOST}/127.0.0.1/" \ .env.sample > .env sed -e "s/\${LARAVEL_VERSION}/^8.0/" \ - -e "s/\${PHP_VERSION}/7.4.16/" \ + -e "s/\${PHP_VERSION}/8.0.11/" \ composer.json.sample > composer.json rm -rf release composer create-project laravel/laravel release rm -rf release/database/migrations -rm release/composer.json +# rm release/composer.json rm release/.env rm -rf release/tests -cp composer.json release/composer.json +# cp composer.json release/composer.json cp -rf database/new_migrations release/database/migrations cp .env release/.env -cd release && COMPOSER_MEMORY_LIMIT=-1 composer update -cd ../../ && COMPOSER_MEMORY_LIMIT=-1 composer update -composer lint-fix +# cd release && COMPOSER_MEMORY_LIMIT=-1 composer update +cd ../ && COMPOSER_MEMORY_LIMIT=-1 composer update +# composer lint-fix sed -e "s/\${USERNAME}/postgres/" \ -e "s/\${PASSWORD}//" \ -e "s/\${DATABASE}/testing/" \