From 472d62399f7ffd21aa300a9490f97e9cbdd484fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 19 Dec 2019 10:30:23 +0100 Subject: [PATCH] Enhancement: Synchronize with ergebnis/php-library-template --- .dependabot/config.yml | 15 +--- .github/settings.yml | 10 +-- .github/workflows/continuous-integration.yml | 83 ++++++++++++-------- Makefile | 2 +- 4 files changed, 56 insertions(+), 54 deletions(-) diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 5043a2cd..a3bd09e6 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -10,19 +10,6 @@ update_configs: default_reviewers: - "localheinz" directory: "/" - package_manager: "github_actions" - update_schedule: "daily" - - - automerged_updates: - - match: - dependency_type: "development" - default_assignees: - - "localheinz" - default_labels: - - "dependency" - default_reviewers: - - "localheinz" - directory: "/" package_manager: "php:composer" - update_schedule: "daily" + update_schedule: "live" version_requirement_updates: "increase_versions" diff --git a/.github/settings.yml b/.github/settings.yml index b217fd99..0b690670 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -10,9 +10,9 @@ branches: required_approving_review_count: 1 required_status_checks: contexts: - - "Coding Standards (7.1)" - - "Dependency Analysis (7.4)" - - "Static Code Analysis (7.4)" + - "Coding Standards (7.1, locked)" + - "Dependency Analysis (7.4, locked)" + - "Static Code Analysis (7.4, locked)" - "Tests (7.1, lowest)" - "Tests (7.1, locked)" - "Tests (7.1, highest)" @@ -25,8 +25,8 @@ branches: - "Tests (7.4, lowest)" - "Tests (7.4, locked)" - "Tests (7.4, highest)" - - "Code Coverage (7.4)" - - "Mutation Tests (7.4)" + - "Code Coverage (7.4, locked)" + - "Mutation Tests (7.4, locked)" - "codecov/patch" - "codecov/project" strict: false diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 170ece36..49e122f7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,12 +21,15 @@ jobs: php-version: - 7.1 + dependencies: + - locked + steps: - name: "Checkout" - uses: actions/checkout@v1 + uses: actions/checkout@v2.0.0 - name: "Install PHP with extensions" - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@1.6.1 with: coverage: none extensions: "mbstring" @@ -36,29 +39,29 @@ jobs: run: composer validate --strict - name: "Cache dependencies installed with composer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: ~/.composer/cache - key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - php${{ matrix.php-version }}-composer-locked- + php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: "Install locked dependencies with composer" run: composer install --no-interaction --no-progress --no-suggest - - name: "Run localheinz/composer-normalize" + - name: "Run ergebnis/composer-normalize" run: composer normalize --dry-run - name: "Create cache directory for friendsofphp/php-cs-fixer" run: mkdir -p .build/php-cs-fixer - name: "Cache cache directory for friendsofphp/php-cs-fixer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: .build/php-cs-fixer - key: php${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('**/composer.lock') }} + key: php-${{ matrix.php-version }}-php-cs-fixer-${{ hashFiles('**/composer.lock') }} restore-keys: | - php${{ matrix.php-version }}-php-cs-fixer- + php-${{ matrix.php-version }}-php-cs-fixer- - name: "Run friendsofphp/php-cs-fixer" run: vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --dry-run --verbose @@ -73,30 +76,33 @@ jobs: php-version: - 7.4 + dependencies: + - locked + steps: - name: "Checkout" - uses: actions/checkout@v1 + uses: actions/checkout@v2.0.0 - name: "Install PHP with extensions" - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@1.6.1 with: coverage: none extensions: "mbstring" php-version: ${{ matrix.php-version }} - name: "Cache dependencies installed with composer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: ~/.composer/cache - key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - php${{ matrix.php-version }}-composer-locked- + php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: "Install locked dependencies with composer" run: composer install --no-interaction --no-progress --no-suggest - name: "Run maglnet/composer-require-checker" - uses: docker://localheinz/composer-require-checker-action:1.1.1 + uses: docker://webfactory/composer-require-checker:2.0.0 static-code-analysis: name: "Static Code Analysis" @@ -108,19 +114,22 @@ jobs: php-version: - 7.4 + dependencies: + - locked + steps: - name: "Checkout" - uses: actions/checkout@v1 + uses: actions/checkout@v2.0.0 - name: "Install PHP with extensions" - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@1.6.1 with: coverage: none extensions: "mbstring" php-version: ${{ matrix.php-version }} - name: "Cache dependencies installed with composer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: ~/.composer/cache key: ${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }} @@ -153,22 +162,22 @@ jobs: steps: - name: "Checkout" - uses: actions/checkout@v1 + uses: actions/checkout@v2.0.0 - name: "Install PHP with extensions" - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@1.6.1 with: coverage: none extensions: "mbstring" php-version: ${{ matrix.php-version }} - name: "Cache dependencies installed with composer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: ~/.composer/cache - key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- + php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: "Install lowest dependencies with composer" if: matrix.dependencies == 'lowest' @@ -201,24 +210,27 @@ jobs: php-version: - 7.4 + dependencies: + - locked + steps: - name: "Checkout" - uses: actions/checkout@v1 + uses: actions/checkout@v2.0.0 - name: "Install PHP with extensions" - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@1.6.1 with: - coverage: xdebug + coverage: pcov extensions: "mbstring" php-version: ${{ matrix.php-version }} - name: "Cache dependencies installed with composer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: ~/.composer/cache - key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - php${{ matrix.php-version }}-composer-locked- + php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: "Install locked dependencies with composer" run: composer install --no-interaction --no-progress --no-suggest @@ -244,24 +256,27 @@ jobs: php-version: - 7.4 + dependencies: + - locked + steps: - name: "Checkout" - uses: actions/checkout@v1 + uses: actions/checkout@v2.0.0 - name: "Install PHP with extensions" - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@1.6.1 with: coverage: xdebug extensions: "mbstring" php-version: ${{ matrix.php-version }} - name: "Cache dependencies installed with composer" - uses: actions/cache@v1 + uses: actions/cache@v1.0.3 with: path: ~/.composer/cache - key: php${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }} restore-keys: | - php${{ matrix.php-version }}-composer-locked- + php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: "Install locked dependencies with composer" run: composer install --no-interaction --no-progress --no-suggest diff --git a/Makefile b/Makefile index 9c72933b..950cf82a 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ coding-standards: vendor ## Fixes code style issues with friendsofphp/php-cs-fix .PHONY: dependency-analysis dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker - docker run --interactive --rm --tty --workdir=/app --volume ${PWD}:/app localheinz/composer-require-checker-action:1.1.1 + docker run --interactive --rm --tty --volume ${PWD}:/app webfactory/composer-require-checker:2.0.0 .PHONY: help help: ## Displays this list of targets with descriptions