Skip to content

Commit 6c623e7

Browse files
authored
minor #72 Workflow Maintenance (sstok)
This PR was merged into the 3.0-dev branch. Discussion ---------- | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | | License | MIT Commits ------- 1f19f95 Update issue templates 989685b Modernize Makefile with rollerscapes/standards
2 parents 23d1542 + 989685b commit 6c623e7

7 files changed

Lines changed: 55 additions & 40 deletions

File tree

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: "\U0001F41B Bug Report"
3+
about: Report errors and problems
4+
title: "[bug] "
5+
labels: Potential Bug
6+
assignees: ''
7+
8+
---
9+
10+
**Description**
11+
<!-- A clear and concise description of the problem. -->
12+
13+
**How to reproduce**
14+
<!-- Code and/or config needed to reproduce the problem. -->
15+
16+
**Possible Solution**
17+
<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
18+
19+
**Additional context**
20+
<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: "\U0001F680 Feature Request"
3+
about: "I have a suggestion (and may want to implement it \U0001F642)!"
4+
title: "[Feature] "
5+
labels: Feature
6+
assignees: ''
7+
8+
---
9+
10+
**Description**
11+
<!-- A clear and concise description of the new feature. -->
12+
13+
**Example**
14+
<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
15+
If the new feature changes an existing feature, include a simple before/after comparison. -->
16+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: ⛔ Security Issue
3+
about: Report security issues and problems (PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY)
4+
5+
---
6+
7+
⚠ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
8+
9+
If you have found a security issue in this project, please send the details to
10+
security [at] rollerscapes.net and don't disclose it publicly until we can provide a
11+
fix for it.
12+
13+
**Note:** Please don't blindly send reports about automated tools, make sure the
14+
reported issue is in fact exploitable. Thanks.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | main for features / 1.4 bug/translation fixes <!-- see below -->
43
| Bug fix? | yes/no
54
| New feature? | yes/no
65
| BC breaks? | yes/no

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
-
5252
name: 'Check the code style'
53-
run: 'make cs-full'
53+
run: 'make cs'
5454

5555
phpstan:
5656
name: 'PhpStan'

Makefile

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,7 @@
1-
QA_DOCKER_IMAGE=jakzal/phpqa:1.92.1-php8.2-alpine
2-
QA_DOCKER_COMMAND=docker run --init -t --rm --user "$(shell id -u):$(shell id -g)" --volume /tmp/tmp-phpqa-$(shell id -u):/tmp --volume "$(shell pwd):/project" --workdir /project ${QA_DOCKER_IMAGE}
1+
include vendor/rollerscapes/standards/Makefile
32

4-
dist: install cs-full phpstan test-full
5-
lint: install cs-full phpstan
3+
QA_DOCKER_IMAGE=jakzal/phpqa:1.115.0-php8.4-alpine
64

7-
install:
8-
composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --prefer-dist --ansi
5+
phpunit:
6+
./vendor/bin/phpunit
97

10-
test:
11-
vendor/bin/phpunit
12-
13-
# Linting tools
14-
phpstan: ensure
15-
vendor/bin/phpstan analyse
16-
17-
cs: ensure
18-
sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --diff"
19-
20-
cs-full: ensure
21-
sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=no --diff"
22-
23-
cs-full-check: ensure
24-
sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=no --diff --dry-run"
25-
26-
ensure:
27-
mkdir -p ${HOME}/.composer /tmp/tmp-phpqa-$(shell id -u)
28-
29-
.PHONY: install test phpstan cs cs-full cs-full-check

0 commit comments

Comments
 (0)