Skip to content

Commit 0c556d5

Browse files
authored
Harmonize CI & files (#155)
1 parent b606444 commit 0c556d5

File tree

11 files changed

+42
-32
lines changed

11 files changed

+42
-32
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @yoanm

.github/workflows/CI.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ on: # Build any PRs and main branch changes
1010
# In case of updates to those workflows, they must be pre-checked by `pre-check-CI-updates.yml` rather than this workflow !
1111
# Any updates on those workflows are expected to be restricted to those workflows only ! (no update on code for instance)
1212
- '.github/workflows/pre-check-CI-updates.yml'
13-
- '.github/workflows/CI.yml'
14-
- '.github/workflows/coverage-upload.yml'
1513
- '.github/workflows/reusable-CI-workflow.yml'
1614
- '.github/workflows/reusable-coverage-upload-workflow.yml'
17-
- '.github/workflows/auto-merge-dependabot.yml'
1815
push:
1916
branches: [ master ]
2017
schedule:
@@ -29,7 +26,6 @@ concurrency:
2926

3027
env:
3128
TEST_OUTPUT_STYLE: pretty
32-
COMPOSER_OPTIONS: --optimize-autoloader
3329

3430
jobs:
3531
tests:

.github/workflows/auto-merge-dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ jobs:
1818
uses: dependabot/fetch-metadata@v2.4.0
1919
with:
2020
github-token: "${{ secrets.GITHUB_TOKEN }}"
21+
22+
- name: Add custom labels
23+
run: gh pr edit "${{github.event.pull_request.html_url}}" --add-label "with-nightly-tests"
24+
env:
25+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
2127
- name: Enable auto-merge for Dependabot PRs
2228
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
2329
run: gh pr merge --auto --squash "$PR_URL"

.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: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ on:
1212
branches: [master] # Only for PR targeting master branch
1313
paths: # /!\ Duplicate the same list as `on.pull_request.paths-ignore` property value for CI workflow !
1414
- '.github/workflows/pre-check-CI-updates.yml' # This workflow
15-
- '.github/workflows/CI.yml'
16-
- '.github/workflows/coverage-upload.yml'
1715
- '.github/workflows/reusable-CI-workflow.yml'
1816
- '.github/workflows/reusable-coverage-upload-workflow.yml'
19-
- '.github/workflows/auto-merge-dependabot.yml'
2017

2118
permissions:
2219
contents: read
@@ -33,7 +30,7 @@ jobs:
3330
contents: read
3431
uses: ./.github/workflows/reusable-CI-workflow.yml
3532

36-
upload:
33+
coverage:
3734
name: Coverage
3835
needs: [tests]
3936
permissions:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ build
33
#A library must not provide a composer.lock file
44
composer.lock
55

6+
#Phpunit
67
.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'

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

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
[![License](https://img.shields.io/github/license/yoanm/php-jsonrpc-server-sdk.svg)](https://github.com/yoanm/php-jsonrpc-server-sdk)
44
[![Code size](https://img.shields.io/github/languages/code-size/yoanm/php-jsonrpc-server-sdk.svg)](https://github.com/yoanm/php-jsonrpc-server-sdk)
5-
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github\&repo=yoanm/php-jsonrpc-server-sdk)](https://dependabot.com)
5+
![Dependabot Status](https://flat.badgen.net/github/dependabot/yoanm/php-jsonrpc-server-sdk)
6+
![Last commit](https://badgen.net/github/last-commit/yoanm/php-jsonrpc-server-sdk)
67

78
[![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/php-jsonrpc-server-sdk.svg?label=Scrutinizer\&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-server-sdk/build-status/master)
89
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/php-jsonrpc-server-sdk/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-server-sdk/?branch=master)

0 commit comments

Comments
 (0)