Skip to content

Commit aa2c782

Browse files
geerteltinkgeerteltink
authored
ci: synchronize workflows (#101)
* ci: synchronize workflows * ci: create new milestones on release
1 parent 1936118 commit aa2c782

File tree

9 files changed

+48
-69
lines changed

9 files changed

+48
-69
lines changed

‎.github/workflows/auto-label-prs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Auto label Pull Requests
22

33
on:
4-
pull_request:
4+
pull_request_target:
55

66
jobs:
77
triage:

‎.github/workflows/automatic-release.yml‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,55 @@
1-
name: Automatic Releases
1+
name: "Automatic Releases"
22

33
on:
44
milestone:
55
types:
6-
- closed
6+
- "closed"
77

88
jobs:
99
release:
10-
name: GIT tag, release & create merge-up PR
10+
name: "GIT tag, release & create merge-up PR"
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v2
14+
- name: "Checkout"
15+
uses: "actions/checkout@v2"
1616

17-
- name: Release
18-
uses: laminas/automatic-releases@v1
17+
- name: "Release"
18+
uses: "laminas/automatic-releases@v1"
1919
with:
20-
command-name: laminas:automatic-releases:release
20+
command-name: "laminas:automatic-releases:release"
2121
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23-
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
24-
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
25-
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
22+
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
23+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
24+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
25+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
2626

27-
- name: Create Merge-Up Pull Request
28-
uses: laminas/automatic-releases@v1
27+
- name: "Create Merge-Up Pull Request"
28+
uses: "laminas/automatic-releases@v1"
2929
with:
30-
command-name: laminas:automatic-releases:create-merge-up-pull-request
30+
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
3131
env:
32-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
34-
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
35-
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
32+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
33+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
34+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
35+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
3636

37-
- name: Create and/or Switch to new Release Branch
38-
uses: laminas/automatic-releases@v1
37+
- name: "Create and/or Switch to new Release Branch"
38+
uses: "laminas/automatic-releases@v1"
3939
with:
40-
command-name: laminas:automatic-releases:switch-default-branch-to-next-minor
40+
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
4141
env:
42-
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
43-
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
44-
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
45-
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
42+
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
43+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
44+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
45+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
46+
47+
- name: "Create new milestones"
48+
uses: "laminas/automatic-releases@v1"
49+
with:
50+
command-name: "laminas:automatic-releases:create-milestones"
51+
env:
52+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
53+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
54+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
55+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

‎.github/workflows/coding-standards.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
dependencies:
15-
- locked
1614
php-version:
1715
- 7.4
1816
operating-system:
@@ -35,20 +33,11 @@ jobs:
3533
path: |
3634
~/.composer/cache
3735
vendor
38-
key: php-${{ matrix.php-version }}-${{ matrix.dependencies }}
39-
restore-keys: php-${{ matrix.php-version }}-${{ matrix.dependencies }}
36+
key: php-${{ matrix.php-version }}
37+
restore-keys: php-${{ matrix.php-version }}
4038

41-
- name: Install lowest dependencies
42-
if: ${{ matrix.dependencies == 'lowest' }}
43-
run: composer update --prefer-lowest --no-interaction --no-progress --no-suggest
44-
45-
- name: Install highest dependencies
46-
if: ${{ matrix.dependencies == 'highest' }}
47-
run: composer update --no-interaction --no-progress --no-suggest
48-
49-
- name: Install locked dependencies
50-
if: ${{ matrix.dependencies == 'locked' }}
39+
- name: Install dependencies
5140
run: composer install --no-interaction --no-progress --no-suggest
5241

53-
- name: Coding Standard
42+
- name: Check coding standard
5443
run: vendor/bin/phpcs

‎.github/workflows/merged-notification.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ jobs:
1818
issue_number: context.issue.number,
1919
owner: context.repo.owner,
2020
repo: context.repo.repo,
21-
body: '👋 Thanks for contributing!'
21+
body: 'Thanks for contributing!'
2222
})

‎.github/workflows/phpunit.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,5 @@ jobs:
4949
if: ${{ matrix.dependencies == 'highest' }}
5050
run: composer update --no-interaction --no-progress --no-suggest --ignore-platform-reqs
5151

52-
- name: Install locked dependencies
53-
if: ${{ matrix.dependencies == 'locked' }}
54-
run: composer install --no-interaction --no-progress --no-suggest --ignore-platform-reqs
55-
5652
- name: Tests
5753
run: vendor/bin/phpunit

‎.github/workflows/static-analysis.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
dependencies:
15-
- locked
1614
php-version:
1715
- 7.4
1816
operating-system:
@@ -35,20 +33,11 @@ jobs:
3533
path: |
3634
~/.composer/cache
3735
vendor
38-
key: php-${{ matrix.php-version }}-${{ matrix.dependencies }}
39-
restore-keys: php-${{ matrix.php-version }}-${{ matrix.dependencies }}
36+
key: php-${{ matrix.php-version }}
37+
restore-keys: php-${{ matrix.php-version }}
4038

41-
- name: Install lowest dependencies
42-
if: ${{ matrix.dependencies == 'lowest' }}
43-
run: composer update --prefer-lowest --no-interaction --no-progress --no-suggest
44-
45-
- name: Install highest dependencies
46-
if: ${{ matrix.dependencies == 'highest' }}
47-
run: composer update --no-interaction --no-progress --no-suggest
48-
49-
- name: Install locked dependencies
50-
if: ${{ matrix.dependencies == 'locked' }}
39+
- name: Install dependencies
5140
run: composer install --no-interaction --no-progress --no-suggest
5241

53-
- name: Rub static analysis
42+
- name: Run static analysis
5443
run: vendor/bin/phpstan analyse --level=0 src test

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
.phpcs-cache
12
.phpunit.result.cache
2-
clover.xml
33
composer.lock
44
phpunit.xml
5-
build/
65
vendor/

‎composer.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "xtreamwayz/html-form-validator",
3-
"type": "project",
3+
"type": "library",
44
"description": "A library validating and filtering submitted data by reusing html form attributes",
5-
"homepage": "https://xtreamwayz.github.io/",
65
"license": "MIT",
76
"authors": [
87
{
@@ -34,9 +33,6 @@
3433
"laminas/laminas-servicemanager": "To support third-party validators and filters"
3534
},
3635
"config": {
37-
"platform": {
38-
"php": "7.4.13"
39-
},
4036
"sort-packages": true
4137
},
4238
"extra": {

‎phpcs.xml‎ renamed to ‎phpcs.xml.dist‎

File renamed without changes.

0 commit comments

Comments
 (0)