Skip to content
This repository has been archived by the owner on Jan 24, 2022. It is now read-only.

Commit

Permalink
Merge pull request #369 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
localheinz committed Jan 6, 2020
2 parents d7c6bfb + da8f6ad commit bf15d05
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ update_configs:
include_scope: true
prefix: "Build"
default_assignees:
- "ergebnis-bot"
- "localheinz"
default_labels:
- "dependency"
default_reviewers:
- "ergebnis-bot"
- "localheinz"
directory: "/"
package_manager: "php:composer"
Expand Down
3 changes: 2 additions & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ branches:
apps:
- "dependabot-preview"
teams: []
users: []
users:
- "ergebnis-bot"

# https://developer.github.com/v3/issues/labels/#create-a-label
# https://developer.github.com/v3/issues/labels/#update-a-label
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: "Create release"
uses: "actions/create-release@v1.0.0"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
with:
draft: false
prerelease: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
run: "mkdir -p .build/psalm"

- name: "Run vimeo/psalm"
run: "vendor/bin/psalm --config=psalm.xml --show-info=false"
run: "vendor/bin/psalm --config=psalm.xml --shepherd --show-info=false --stats"

tests:
name: "Tests"
Expand Down Expand Up @@ -344,8 +344,8 @@ jobs:
- "tests"

steps:
- name: "Approve"
- name: "Approve pull requests created by dependabot that update development dependencies"
uses: "hmarr/auto-approve-action@v2.0.0"
if: "(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') && github.event_name == 'pull_request' && startsWith(github.event.pull_request.title, 'Build(deps-dev)')"
with:
github-token: "${{ secrets.AUTO_APPROVE_TOKEN }}"
github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
days-before-close: 5
days-before-stale: 60
repo-token: "${{ secrets.GITHUB_TOKEN }}"
repo-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
stale-issue-label: 'stale'
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan
mkdir -p .build/phpstan
vendor/bin/phpstan analyse --configuration=phpstan.neon
mkdir -p .build/psalm
vendor/bin/psalm --config=psalm.xml --show-info=false
vendor/bin/psalm --config=psalm.xml --show-info=false --stats

.PHONY: static-code-analysis-baseline
static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with phpstan/phpstan and vimeo/psalm
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# github-changelog

[![Continuous Deployment](https://github.com/ergebnis/github-changelog/workflows/Continuous%20Deployment/badge.svg)](https://github.com/ergebnis/github-changelog/actions)
[![Continuous Integration](https://github.com/ergebnis/github-changelog/workflows/Continuous%20Integration/badge.svg)](https://github.com/ergebnis/github-changelog/actions)
[![Code Coverage](https://codecov.io/gh/ergebnis/github-changelog/branch/master/graph/badge.svg)](https://codecov.io/gh/ergebnis/github-changelog)
[![Type Coverage](https://shepherd.dev/github/ergebnis/github-changelog/coverage.svg)](https://shepherd.dev/github/ergebnis/github-changelog)
[![Latest Stable Version](https://poser.pugx.org/ergebnis/github-changelog/v/stable)](https://packagist.org/packages/ergebnis/github-changelog)
[![Total Downloads](https://poser.pugx.org/ergebnis/github-changelog/downloads)](https://packagist.org/packages/ergebnis/github-changelog)

Expand Down

0 comments on commit bf15d05

Please sign in to comment.