Skip to content

Commit

Permalink
Merge pull request #431 from ergebnis/feature/synchronize
Browse files Browse the repository at this point in the history
Enhancement: Synchronize with ergebnis/php-library-template
  • Loading branch information
ergebnis-bot authored Jan 2, 2021
2 parents 86b544f + d520080 commit 02da782
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 36 deletions.
8 changes: 4 additions & 4 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -88,7 +87,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "7.2"

dependencies:
- "locked"
Expand Down Expand Up @@ -130,7 +129,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "7.2"

dependencies:
- "locked"
Expand Down Expand Up @@ -251,7 +250,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "7.2"

dependencies:
- "locked"
Expand Down Expand Up @@ -301,7 +300,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "7.2"

dependencies:
- "locked"
Expand Down Expand Up @@ -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/[email protected]"
with:
github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
Expand All @@ -371,7 +369,7 @@ jobs:
const repository = context.repo
const reviewers = [
"${{ env.ERGEBNIS_BOT_NAME }}",
"ergebnis-bot",
]
await github.pulls.requestReviewers({
Expand All @@ -381,7 +379,7 @@ jobs:
reviewers: reviewers,
})
- name: "Assign @${{ env.ERGEBNIS_BOT_NAME }}"
- name: "Assign @ergebnis-bot"
uses: "actions/[email protected]"
with:
github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
Expand All @@ -390,7 +388,7 @@ jobs:
const repository = context.repo
const assignees = [
"${{ env.ERGEBNIS_BOT_NAME }}",
"ergebnis-bot",
]
await github.issues.addAssignees({
Expand All @@ -402,7 +400,6 @@ jobs:
- name: "Approve pull request"
uses: "actions/[email protected]"
if: "github.actor != '${{ env.ERGEBNIS_BOT_NAME }}'"
with:
github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
script: |
Expand Down
27 changes: 10 additions & 17 deletions .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "[email protected]"
ERGEBNIS_BOT_NAME: "ergebnis-bot"
PHP_EXTENSIONS: "mbstring"

jobs:
Expand All @@ -28,6 +26,8 @@ jobs:
steps:
- name: "Checkout"
uses: "actions/[email protected]"
with:
token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"

- name: "Install PHP with extensions"
uses: "shivammathur/[email protected]"
Expand Down Expand Up @@ -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 <[email protected]>"
commit_message: "Enhancement: Update license year"
commit_user_email: "[email protected]"
commit_user_name: "ergebnis-bot"
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 02da782

Please sign in to comment.