Skip to content

Commit 665cbf4

Browse files
committed
[DOC] Run make for rdoc-coverage and generating html
1 parent eca5e5c commit 665cbf4

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/check_misc.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ jobs:
2828
# Skip overwriting MATZBOT_AUTO_UPDATE_TOKEN
2929
checkout: '' # false (ref: https://github.com/actions/runner/issues/2238)
3030

31+
- name: Re-generate Makefiles # same as actions/setup/directories/action.yml
32+
run: |
33+
for mk in Makefile GNUmakefile; do
34+
sed -f tool/prereq.status template/$mk.in > $mk
35+
done
36+
3137
- name: Check for code styles
3238
run: |
3339
set -x
@@ -74,7 +80,6 @@ jobs:
7480
run: |
7581
set -- $(sed 's/#.*//;/^rdoc /!d' gems/bundled_gems)
7682
{ echo version=$2; echo ref=$4; } >> $GITHUB_OUTPUT
77-
echo RDOC='ruby -W0 --disable-gems tool/rdoc-srcdir -q' >> $GITHUB_ENV
7883
7984
- name: Checkout rdoc
8085
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -84,7 +89,7 @@ jobs:
8489
path: .bundle/gems/rdoc-${{ steps.rdoc.outputs.version }}
8590
if: ${{ steps.rdoc.outputs.ref != '' }}
8691

87-
- name: Generate rdoc
92+
- name: Generate rdoc scripts
8893
run: |
8994
set -x
9095
gempath=$(ruby -e 'print Gem.user_dir, "/bin"')
@@ -98,12 +103,12 @@ jobs:
98103

99104
- name: Core docs coverage
100105
run: |
101-
$RDOC -C -x ^ext -x ^lib .
106+
make XRUBY=ruby RDOC_DEPENDS= RBCONFIG=update-rbconfig rdoc-coverage
102107
103108
- name: Generate docs
104109
id: docs
105110
run: |
106-
$RDOC --op html .
111+
make XRUBY=ruby RDOC_DEPENDS= RBCONFIG=update-rbconfig html
107112
echo htmlout=ruby-html-${GITHUB_SHA:0:10} >> $GITHUB_OUTPUT
108113
# Generate only when document commit/PR
109114
if: >-

common.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,23 +608,24 @@ post-install-dbg::
608608

609609
srcs-doc: prepare-gems
610610

611-
rdoc: PHONY main srcs-doc
611+
RDOC_DEPENDS = main srcs-doc
612+
rdoc: PHONY $(RDOC_DEPENDS) $(RBCONFIG)
612613
@echo Generating RDoc documentation
613614
$(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) .
614615

615-
html: PHONY main srcs-doc
616+
html: PHONY $(RDOC_DEPENDS) $(RBCONFIG)
616617
@echo Generating RDoc HTML files
617618
$(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) .
618619

619620
RDOC_COVERAGE_EXCLUDES = -x ^ext/json -x ^ext/openssl -x ^ext/psych \
620621
-x ^lib/bundler -x ^lib/rubygems \
621622
-x ^lib/did_you_mean -x ^lib/error_highlight -x ^lib/syntax_suggest
622623

623-
rdoc-coverage: PHONY main srcs-doc
624+
rdoc-coverage: PHONY $(RDOC_DEPENDS) $(RBCONFIG)
624625
@echo Generating RDoc coverage report
625626
$(Q) $(RDOC) --quiet -C $(RDOCFLAGS) $(RDOC_COVERAGE_EXCLUDES) .
626627

627-
undocumented: PHONY main srcs-doc
628+
undocumented: PHONY $(RDOC_DEPENDS) $(RBCONFIG)
628629
$(Q) $(RDOC) --quiet -C $(RDOCFLAGS) $(RDOC_COVERAGE_EXCLUDES) . | \
629630
sed -n \
630631
-e '/^ *# in file /{' -e 's///;N;s/\n/: /p' -e '}' \

0 commit comments

Comments
 (0)