Skip to content

Commit 8277482

Browse files
committed
Mirror from implementation branch
1 parent 9f13728 commit 8277482

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

.github/workflows/docbook-cs.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ jobs:
4141
path: "doc-base"
4242
repository: "php/doc-base"
4343

44+
- name: "Checkout php/docbook-cs"
45+
uses: "actions/checkout@v6"
46+
with:
47+
path: "docbook-cs"
48+
repository: "php/docbook-cs"
49+
4450
- name: "Fetch base branch with merge-base"
4551
working-directory: "${{ matrix.language }}"
4652
run: |
@@ -58,7 +64,7 @@ jobs:
5864
with:
5965
php-version: "8.5"
6066
extensions: "dom, libxml, simplexml"
61-
tools: composer:v2, cs2pr:^1.8
67+
tools: composer, cs2pr
6268

6369
- name: "Build documentation"
6470
run: |
@@ -69,17 +75,17 @@ jobs:
6975
--with-lang=${{ matrix.language }}
7076
7177
- name: "Install docbook-cs"
72-
working-directory: "${{ matrix.language }}"
73-
run: composer require jordikroon/docbook-cs:^1.1
78+
working-directory: "docbook-cs"
79+
run: composer install --no-interaction --no-progress
7480

7581
- name: "Run docbook-cs with diff"
7682
working-directory: "${{ matrix.language }}"
7783
run: |
7884
set -o pipefail
79-
git diff origin/${{ github.base_ref }}...HEAD | vendor/bin/docbook-cs \
85+
git diff origin/${{ github.base_ref }}...HEAD | php ../docbook-cs/bin/docbook-cs \
8086
--report=checkstyle \
8187
--diff \
82-
--no-colors > docbook-report.xml || true
88+
--no-colors > docbook-report.xml
8389
8490
- name: "Upload report"
8591
if: ${{ ! cancelled() }}

docbookcs.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<docbookcs xmlns="https://jordikroon.github.io/docbook-cs/config"
2+
<docbookcs xmlns="https://php.github.io/docbook-cs/config"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="https://jordikroon.github.io/docbook-cs/config
5-
https://jordikroon.github.io/docbook-cs/config.xsd">
4+
xsi:schemaLocation="https://php.github.io/docbook-cs/config
5+
https://php.github.io/docbook-cs/config.xsd">
66

77
<project>
88
<directory alias="doc-en">en</directory>
@@ -31,7 +31,6 @@
3131
</entities>
3232

3333
<exclude>
34-
<pattern>*/wkhtmltox/bits/*</pattern>
3534
<pattern>output/*</pattern>
3635
</exclude>
3736

0 commit comments

Comments
 (0)