diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 99f70db73..92ff64e52 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -28,19 +28,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: "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 db0702ce6..f7cf4a7a7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -67,19 +67,10 @@ jobs: createdb -h localhost -p 5432 -U wallabag wallabag_test pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag - - 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: "Prepare database" run: "make prepare DB=${{ matrix.database }}" diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 67cb74dc1..c7a9e0b59 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -33,19 +33,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: "Validate Core translations" run: "php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v"