Skip to content

Commit

Permalink
Merge pull request #169 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 Jul 4, 2020
2 parents 55f2ab9 + 629d596 commit fa39488
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://help.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
# https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2

Expand Down
14 changes: 7 additions & 7 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
branches:
- name: "main"

# https://developer.github.com/v3/repos/branches/#remove-branch-protection
# https://developer.github.com/v3/repos/branches/#update-branch-protection
# https://docs.github.com/en/rest/reference/repos#delete-branch-protection
# https://docs.github.com/en/rest/reference/repos#update-branch-protection

protection:
enforce_admins: false
Expand Down Expand Up @@ -34,7 +34,7 @@ branches:
strict: false
restrictions:

# https://developer.github.com/v3/repos/branches/#parameters-1
# https://docs.github.com/en/rest/reference/repos#list-branches--parameters

# Note: User, app, and team restrictions are only available for organization-owned repositories.
# Set to null to disable when using this configuration for a repository on a personal account.
Expand All @@ -44,8 +44,8 @@ branches:
users:
- "ergebnis-bot"

# https://developer.github.com/v3/issues/labels/#create-a-label
# https://developer.github.com/v3/issues/labels/#update-a-label
# https://docs.github.com/en/rest/reference/issues#create-a-label
# https://docs.github.com/en/rest/reference/issues#update-a-label

labels:
- name: "bug"
Expand Down Expand Up @@ -76,7 +76,7 @@ labels:
color: "eeeeee"
description: ""

# https://developer.github.com/v3/repos/#edit
# https://docs.github.com/en/rest/reference/repos#update-a-repository

repository:
allow_merge_commit: true
Expand All @@ -94,6 +94,6 @@ repository:
name: "json-printer"
private: false

# https://developer.github.com/v3/repos/branches/#remove-branch-protection
# https://docs.github.com/en/rest/reference/repos#replace-all-repository-topics

topics: "json, printer, formatter"
6 changes: 2 additions & 4 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
# https://docs.github.com/en/actions

name: "Integrate"

Expand Down Expand Up @@ -72,9 +72,7 @@ jobs:
run: "composer update --no-interaction --no-progress --no-suggest"

- name: "Run ergebnis/composer-normalize"
uses: "docker://ergebnis/composer-normalize-action:0.8.0"
with:
args: "--dry-run"
run: "tools/composer-normalize --dry-run"

- name: "Create cache directory for friendsofphp/php-cs-fixer"
run: "mkdir -p .build/php-cs-fixer"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prune.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://github.com/actions/stale
# https://docs.github.com/en/actions

name: "Prune"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
# https://docs.github.com/en/actions

name: "Release"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
# https://docs.github.com/en/actions

name: "Renew"

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/triage.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# https://docs.github.com/en/actions

name: "Triage"

on: # yamllint disable-line rule:truthy
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ code-coverage: vendor ## Collects coverage from running unit tests with phpunit/

.PHONY: coding-standards
coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-normalize, lints YAML files with yamllint and fixes code style issues with friendsofphp/php-cs-fixer
docker run --interactive --rm --tty --workdir=/app --volume ${PWD}:/app ergebnis/composer-normalize-action:0.8.0
tools/composer-normalize
yamllint -c .yamllint.yaml --strict .
mkdir -p .build/php-cs-fixer
vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose
Expand Down
1 change: 1 addition & 0 deletions phive.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-normalize" version="^2.5.1" installed="2.5.1" location="./tools/composer-normalize" copy="true"/>
<phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./tools/composer-require-checker" copy="true"/>
</phive>
Binary file added tools/composer-normalize
Binary file not shown.

0 comments on commit fa39488

Please sign in to comment.