diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 34669edb..8066da24 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -32,19 +32,10 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - name: "Install dependencies with Composer" - run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist" + uses: "ramsey/composer-install@v1" + with: + composer-options: "--optimize-autoloader --prefer-dist" - name: "Run PHP CS Fixer" run: "php vendor/bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index f837aad6..f87e5a36 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -41,19 +41,10 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - - name: "Install dependencies with composer" - run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist" + composer-options: "--optimize-autoloader --prefer-dist" - name: "Setup logs" run: "mkdir -p build/logs" @@ -87,19 +78,10 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - - name: "Install dependencies with composer" - run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist" + composer-options: "--optimize-autoloader --prefer-dist" - name: "Setup logs" run: "mkdir -p build/logs" @@ -144,19 +126,11 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - - name: "Install dependencies with composer" - run: "composer update --prefer-dist --no-progress --no-suggest -o --prefer-lowest" + composer-options: "--optimize-autoloader --prefer-dist" + dependency-versions: "lowest" - name: "Setup logs" run: "mkdir -p build/logs" @@ -190,19 +164,10 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - - name: "Install dependencies with composer" - run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist" + composer-options: "--optimize-autoloader --prefer-dist" - name: "Setup adapter: Guzzle 5" run: | @@ -241,19 +206,10 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - - name: "Install dependencies with composer" - run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist" + composer-options: "--optimize-autoloader --prefer-dist" - name: "Setup adapter: Guzzle 7" run: | @@ -292,19 +248,10 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: "Cache dependencies installed with Composer" - uses: "actions/cache@v2" + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v1" with: - path: ${{ steps.composer-cache.outputs.dir }} - key: "php-${{ matrix.php }}-composer-locked-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php }}-composer-locked-" - - - name: "Install dependencies with composer" - run: "composer install --no-interaction --optimize-autoloader --no-progress --prefer-dist" + composer-options: "--optimize-autoloader --prefer-dist" - name: "Setup adapter: cURL" run: | diff --git a/.travis.yml b/.travis.yml index 2f3521d3..95fdb466 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,11 @@ if: | branch = master php: - - nightly + - 8.0 jobs: allow_failures: - - php: nightly + - php: 8.0 cache: directories: @@ -22,6 +22,7 @@ before_install: - composer config github-oauth.github.com ${GH_TOKEN} install: + - composer remove friendsofphp/php-cs-fixer --dev --no-interaction - composer update --prefer-dist --no-progress -o before_script: