From d520080372cc12fa940e4101f69bc0f2fb316b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 2 Jan 2021 12:51:36 +0100 Subject: [PATCH] Enhancement: Synchronize with ergebnis/php-library-template --- .github/settings.yml | 8 ++++---- .github/workflows/integrate.yaml | 19 ++++++++----------- .github/workflows/renew.yaml | 27 ++++++++++----------------- README.md | 8 ++++---- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 2d42c020..d97d7915 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -14,11 +14,11 @@ branches: required_approving_review_count: 1 required_status_checks: contexts: - - "Code Coverage (7.4, locked)" + - "Code Coverage (7.2, locked)" - "Coding Standards (7.2, locked)" - - "Dependency Analysis (7.4, locked)" - - "Mutation Tests (7.4, locked)" - - "Static Code Analysis (7.4, locked)" + - "Dependency Analysis (7.2, locked)" + - "Mutation Tests (7.2, locked)" + - "Static Code Analysis (7.2, locked)" - "Tests (7.2, highest)" - "Tests (7.2, locked)" - "Tests (7.2, lowest)" diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index b4f50b2e..c16e6178 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -9,7 +9,6 @@ on: # yamllint disable-line rule:truthy - "main" env: - ERGEBNIS_BOT_NAME: "ergebnis-bot" MIN_COVERED_MSI: 92 MIN_MSI: 90 PHP_EXTENSIONS: "mbstring" @@ -88,7 +87,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "7.2" dependencies: - "locked" @@ -130,7 +129,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "7.2" dependencies: - "locked" @@ -251,7 +250,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "7.2" dependencies: - "locked" @@ -301,7 +300,7 @@ jobs: strategy: matrix: php-version: - - "7.4" + - "7.2" dependencies: - "locked" @@ -357,12 +356,11 @@ jobs: ) && ( (github.actor == 'dependabot[bot]' && startsWith(github.event.pull_request.title, 'composer(deps-dev)')) || (github.actor == 'dependabot[bot]' && startsWith(github.event.pull_request.title, 'github-actions(deps)')) || - (github.actor == 'ergebnis-bot' && github.event.pull_request.title == 'Enhancement: Update license year') || (github.actor == 'localheinz' && contains(github.event.pull_request.labels.*.name, 'merge')) ) steps: - - name: "Request review from @${{ env.ERGEBNIS_BOT_NAME }}" + - name: "Request review from @ergebnis-bot" uses: "actions/github-script@v3.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" @@ -371,7 +369,7 @@ jobs: const repository = context.repo const reviewers = [ - "${{ env.ERGEBNIS_BOT_NAME }}", + "ergebnis-bot", ] await github.pulls.requestReviewers({ @@ -381,7 +379,7 @@ jobs: reviewers: reviewers, }) - - name: "Assign @${{ env.ERGEBNIS_BOT_NAME }}" + - name: "Assign @ergebnis-bot" uses: "actions/github-script@v3.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" @@ -390,7 +388,7 @@ jobs: const repository = context.repo const assignees = [ - "${{ env.ERGEBNIS_BOT_NAME }}", + "ergebnis-bot", ] await github.issues.addAssignees({ @@ -402,7 +400,6 @@ jobs: - name: "Approve pull request" uses: "actions/github-script@v3.1" - if: "github.actor != '${{ env.ERGEBNIS_BOT_NAME }}'" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" script: | diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index 6cb295f1..f28d005e 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -4,11 +4,9 @@ name: "Renew" on: # yamllint disable-line rule:truthy schedule: - - cron: "1 0 1 1 *" + - cron: "0 0 1 1 *" env: - ERGEBNIS_BOT_EMAIL: "bot@ergebn.is" - ERGEBNIS_BOT_NAME: "ergebnis-bot" PHP_EXTENSIONS: "mbstring" jobs: @@ -28,6 +26,8 @@ jobs: steps: - name: "Checkout" uses: "actions/checkout@v2.3.4" + with: + token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@2.9.0" @@ -65,19 +65,12 @@ jobs: restore-keys: "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" + run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose" - - name: "Open pull request updating license year" - uses: "gr2m/create-or-update-pull-request-action@v1.3.3" + - name: "Commit modified files" + uses: "stefanzweifel/git-auto-commit-action@v4.8.0" with: - author: "${{ env.ERGEBNIS_BOT_NAME }} <${{ env.ERGEBNIS_BOT_EMAIL }}>" - branch: "feature/license-year" - body: | - This PR - - * [x] updates the license year - commit-message: "Enhancement: Update license year" - path: "." - title: "Enhancement: Update license year" - env: - GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" + commit_author: "ergebnis-bot " + commit_message: "Enhancement: Update license year" + commit_user_email: "bot@ergebn.is" + commit_user_name: "ergebnis-bot" diff --git a/README.md b/README.md index bd5448bb..7ca8438c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # json-normalizer -[![Integrate](https://github.com/ergebnis/json-normalizer/workflows/Integrate/badge.svg?branch=main)](https://github.com/ergebnis/json-normalizer/actions) -[![Prune](https://github.com/ergebnis/json-normalizer/workflows/Prune/badge.svg?branch=main)](https://github.com/ergebnis/json-normalizer/actions) -[![Release](https://github.com/ergebnis/json-normalizer/workflows/Release/badge.svg?branch=main)](https://github.com/ergebnis/json-normalizer/actions) -[![Renew](https://github.com/ergebnis/json-normalizer/workflows/Renew/badge.svg?branch=main)](https://github.com/ergebnis/json-normalizer/actions) +[![Integrate](https://github.com/ergebnis/json-normalizer/workflows/Integrate/badge.svg)](https://github.com/ergebnis/json-normalizer/actions) +[![Prune](https://github.com/ergebnis/json-normalizer/workflows/Prune/badge.svg)](https://github.com/ergebnis/json-normalizer/actions) +[![Release](https://github.com/ergebnis/json-normalizer/workflows/Release/badge.svg)](https://github.com/ergebnis/json-normalizer/actions) +[![Renew](https://github.com/ergebnis/json-normalizer/workflows/Renew/badge.svg)](https://github.com/ergebnis/json-normalizer/actions) [![Code Coverage](https://codecov.io/gh/ergebnis/json-normalizer/branch/main/graph/badge.svg)](https://codecov.io/gh/ergebnis/json-normalizer) [![Type Coverage](https://shepherd.dev/github/ergebnis/json-normalizer/coverage.svg)](https://shepherd.dev/github/ergebnis/json-normalizer)