Skip to content

Commit d13d864

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Remove not-supported contents directive Fail the build when needed Bump deps of the builder Remove undefined refs
2 parents 0643e1e + 7072136 commit d13d864

File tree

7 files changed

+229
-216
lines changed

7 files changed

+229
-216
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ jobs:
4545

4646
- name: "Build the docs"
4747
working-directory: _build
48-
run: php build.php -vvv
49-
50-
- name: Show log file
51-
if: ${{ always() }}
52-
run: cat _build/logs.txt || true
48+
run: php build.php --disable-cache
5349

5450
doctor-rst:
5551
name: Lint (DOCtor-RST)

_build/build.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@
5757
$io->error(sprintf("There were some errors while building the docs:\n\n%s\n", $result->getErrorTrace()));
5858
$io->newLine();
5959
$io->comment('Tip: you can add the -v, -vv or -vvv flags to this command to get debug information.');
60+
61+
return 1;
6062
}
63+
64+
return 0;
6165
})
6266
->getApplication()
6367
->setDefaultCommand('build-docs', true)

0 commit comments

Comments
 (0)