Skip to content

Commit 58a3520

Browse files
authored
Harmonize CI & files (#31)
1 parent 5e842a9 commit 58a3520

12 files changed

+84
-66
lines changed

.github/workflows/coverage-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
checks: write # For the check run creation !
1010

1111
jobs:
12-
upload:
12+
coverage:
1313
name: Coverage
1414
permissions:
1515
contents: read

.github/workflows/pre-check-CI-updates.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
contents: read
3131
uses: ./.github/workflows/reusable-CI-workflow.yml
3232

33-
upload:
34-
name: Upload
33+
coverage:
34+
name: Coverage
3535
needs: [tests]
3636
permissions:
3737
contents: read

.github/workflows/reusable-CI-workflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ jobs:
6060
- job-name: Up to date versions # => Highest versions allowed by composer config
6161
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6262
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
63-
## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
63+
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
6464
pkg-extra-constraints: behat/gherkin:~4.12.0
6565
- job-name: Up to date versions - Special case - Symfony 5.4
6666
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6767
symfony-version: '5.4'
68-
## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
68+
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
6969
# Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
7070
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && 'symfony/yaml:~6.4.0' || '' }}
7171
- job-name: Bare minimum # => Lowest versions allowed by composer config
@@ -222,9 +222,9 @@ jobs:
222222
needs: [ fetch-supported-versions, tests ]
223223
if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'with-nightly-tests') ) }}
224224
runs-on: ubuntu-latest
225-
continue-on-error: true
226225
permissions:
227226
contents: read
227+
continue-on-error: true
228228
env:
229229
COMPOSER_IGNORE_PLATFORM_REQ: 'php+'
230230
strategy:
@@ -251,8 +251,8 @@ jobs:
251251
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
252252
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
253253
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
254-
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
255254
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
255+
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
256256
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
257257

258258
steps:

.github/workflows/reusable-coverage-upload-workflow.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
outputs:
3333
commit-sha: ${{ steps.fetch-workflow-metadata.outputs.commit-sha }}
3434
run-id: ${{ steps.fetch-workflow-metadata.outputs.run-id }}
35+
branch: ${{ steps.fetch-workflow-metadata.outputs.branch }}
36+
pull-request: ${{ steps.fetch-workflow-metadata.outputs.pull-request }}
3537

3638
codacy-uploader:
3739
name: Codacy
@@ -64,6 +66,6 @@ jobs:
6466
run-id: ${{ needs.fetch-info.outputs.run-id }}
6567
force-git-commit: ${{ needs.fetch-info.outputs.commit-sha }}
6668
force-git-branch: ${{ needs.fetch-info.outputs.branch }}
67-
force-gh-pr: ${{ needs.fetch-info.outputs.pr-number }}
69+
force-gh-pr: ${{ needs.fetch-info.outputs.pull-request }}
6870
force-uploader-build: ${{ needs.fetch-info.outputs.run-id }}
6971
force-uploader-build-url: ${{ needs.fetch-info.outputs.run-url }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ build
33
#A library must not provide a composer.lock file
44
composer.lock
55

6-
features/demo_app/var
6+
# Demo app excluded dirs
7+
features/demo_app/var/
78

89
#Phpunit
910
.phpunit.result.cache

.remarkrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"plugins": [
33
"remark-preset-lint-consistent",
4-
"remark-preset-lint-recommended"
4+
"remark-preset-lint-recommended",
5+
[
6+
"remark-lint-list-item-indent",
7+
"space"
8+
]
59
]
610
}

.scrutinizer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ build:
4141
variables:
4242
CI: 'true'
4343
TEST_OUTPUT_STYLE: 'pretty'
44-
COMPOSER_OPTIONS: '--optimize-autoloader'
4544
COVERAGE_OUTPUT_STYLE: 'clover'
4645
COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
4746
PHPCS_DISABLE_WARNING: 'true'

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ include:
2323
Examples of unacceptable behavior by participants include:
2424

2525
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
26+
advances
2727
* Trolling, insulting/derogatory comments, and personal or political attacks
2828
* Public or private harassment
2929
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
30+
address, without explicit permission
3131
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
32+
professional setting
3333

3434
## Our Responsibilities
3535

CONTRIBUTING.md

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
11
# Contributing
22

33
## Getting Started
4-
* Fork, then clone the repo:
4+
5+
* Fork, then clone the repo:
6+
57
```bash
68
git clone git@github.com:your-username/symfony-jsonrpc-params-sf-constraints-doc.git
7-
````
9+
```
10+
11+
* Make sure everything goes well:
812

9-
* Make sure everything goes well:
1013
```bash
1114
make build
1215
make test
1316
```
1417

15-
* Make your changes (Add/Update tests according to your changes).
16-
* Make sure tests are still green:
18+
* Make your changes (Add/Update tests according to your changes).
19+
* Make sure tests are still green:
20+
1721
```bash
1822
make test
1923
```
2024

21-
* To check code coverage, launch
25+
* To check code coverage, launch
26+
2227
```bash
2328
make coverage
2429
```
2530

26-
* Push to your fork and [submit a pull request](https://github.com/yoanm/symfony-jsonrpc-params-sf-constraints-doc/compare/).
27-
* Wait for feedback or merge.
31+
* Push to your fork and [submit a pull request](https://github.com/yoanm/symfony-jsonrpc-params-sf-constraints-doc/compare/).
32+
* Wait for feedback or merge.
33+
34+
Some stuff that will increase your pull request's acceptance:
2835

29-
Some stuff that will increase your pull request's acceptance:
30-
* Write tests.
31-
* Follow PSR-2 coding style.
32-
* Write good commit messages.
33-
* Do not rebase or squash your commits when a review has been made.
36+
* Write tests.
37+
* Follow PSR-2 coding style.
38+
* Write good commit messages.
39+
* Do not rebase or squash your commits when a review has been made.

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,13 @@ scrutinizer-behat:
109109
create-build-directories:
110110
mkdir -p ${PHPUNIT_COVERAGE_DIRECTORY} ${BEHAT_COVERAGE_DIRECTORY} ${REPORTS_DIRECTORY}
111111

112+
.PHONY: configure-dev-env
113+
configure-dev-env:
114+
npm install --global remark-cli remark-preset-lint-consistent remark-preset-lint-recommended remark-lint-list-item-indent
115+
116+
.PHONY: lint-markdown
117+
lint-markdown:
118+
npx remark . --output
119+
112120
.PHONY: build install configure test test-unit test-functional codestyle create-build-directories scrutinizer-behat scrutinizer-phpunit
113121
.DEFAULT: build

0 commit comments

Comments
 (0)