Skip to content

Commit 45e7f69

Browse files
Review
1 parent 9d33116 commit 45e7f69

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
needs: [build-context, check-docs]
5555
if: fromJSON(needs.build-context.outputs.run-idle-help-doc)
5656
uses: ./.github/workflows/reusable-idle-help-doc.yml
57+
with:
58+
idle-html-artifact-id: ${{ needs.check-docs.outputs.idle-html-artifact-id }}
5759

5860
check-autoconf-regen:
5961
name: 'Check if Autoconf files are up to date'
@@ -719,14 +721,7 @@ jobs:
719721
cifuzz,
720722
check-idle-help-doc,
721723
allowed-skips: >-
722-
${{
723-
!fromJSON(needs.build-context.outputs.run-docs)
724-
&& '
725-
check-docs,
726-
check-idle-help-doc,
727-
'
728-
|| ''
729-
}}
724+
${{ !fromJSON(needs.build-context.outputs.run-docs) && 'check-docs,' || '' }}
730725
${{
731726
needs.build-context.outputs.run-tests != 'true'
732727
&& '

.github/workflows/reusable-docs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Reusable Docs
22

33
on:
44
workflow_call:
5+
outputs:
6+
idle-html-artifact-id:
7+
description: 'Artifact ID for the built idle.html'
8+
value: ${{ jobs.build-doc.outputs.idle-html-artifact-id }}
59
workflow_dispatch:
610

711
permissions:
@@ -19,6 +23,8 @@ jobs:
1923
name: 'Docs'
2024
runs-on: ubuntu-latest
2125
timeout-minutes: 60
26+
outputs:
27+
idle-html-artifact-id: ${{ steps.upload-idle-html.outputs.artifact-id }}
2228
env:
2329
branch_base: 'origin/${{ github.event.pull_request.base.ref }}'
2430
branch_pr: 'origin/${{ github.event.pull_request.head.ref }}'
@@ -76,6 +82,7 @@ jobs:
7682
--fail-if-improved \
7783
--fail-if-new-news-nit
7884
- name: 'Upload built idle.html'
85+
id: upload-idle-html
7986
uses: actions/upload-artifact@v4
8087
with:
8188
name: idle-html

.github/workflows/reusable-idle-help-doc.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Reusable check IDLE help
22

33
on:
44
workflow_call:
5+
inputs:
6+
idle-html-artifact-id:
7+
description: 'Artifact ID for the built idle.html'
8+
required: true
9+
type: string
510

611
permissions: {}
712

@@ -20,16 +25,14 @@ jobs:
2025
- name: 'Download built idle.html'
2126
uses: actions/download-artifact@v7
2227
with:
23-
name: idle-html
28+
artifact-ids: ${{ inputs.idle-html-artifact-id }}
2429
path: Doc/build/html/library
2530
- name: 'Set up Python'
2631
uses: actions/setup-python@v6
2732
with:
2833
python-version: '3'
2934
- name: 'Regenerate Lib/idlelib/help.html'
30-
run: |
31-
mkdir -v html/ # trick make into skipping the dependency target
32-
make idlehelp
35+
run: make idlehelp
3336
working-directory: Doc
3437
- name: 'Check for changes'
3538
run: |

Doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pydoc-topics: build
145145
"&& cp build/pydoc-topics/module_docs.py ../Lib/pydoc_data/module_docs.py"
146146

147147
.PHONY: idlehelp
148-
idlehelp: html
148+
idlehelp: build/html/library/idle.html
149149
$(PYTHON) ../Tools/build/generate_idle_help.py
150150

151151
.PHONY: gettext

0 commit comments

Comments
 (0)