Skip to content

GH-546: Migrate Sphinx documentation - #553

Merged
kou merged 8 commits into
apache:mainfrom
lidavidm:gh-546
Jan 24, 2025
Merged

GH-546: Migrate Sphinx documentation#553
kou merged 8 commits into
apache:mainfrom
lidavidm:gh-546

Conversation

@lidavidm

Copy link
Copy Markdown
Member

Fixes#546.

@lidavidm

Copy link
Copy Markdown
MemberAuthor

This doesn't combine the Javadocs and Sphinx docs. I'd like to extract the plugin from arrow-adbc (that lets you reference Javadocs via Intersphinx) for that purpose eventually.

@lidavidm
lidavidmforce-pushed the gh-546 branch 4 times, most recently from 058659d to 0207fc9CompareJanuary 22, 2025 08:00
@lidavidm
lidavidm marked this pull request as ready for review January 23, 2025 05:27
Comment thread.github/workflows/rc.yml Outdated
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: release-sphinx-docs
path: docs.tar.gz

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you rename this to sphinx-docs.tar.gz or rename existing docs.tar.gz to api-docs.tar.gz?
If we use duplicated names, we can't upload both of them to GitHub Releases.

Or how about combining them something like the following?

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
index 821ad083..46afe8f3 100644
--- a/.github/workflows/rc.yml+++ b/.github/workflows/rc.yml@@ -399,9 +399,8 @@ jobs:
ci/scripts/jni_full_build.sh . jni binaries
- name: Prepare docs
run: |
- mkdir -p docs- cp -a target/site/apidocs docs/reference- tar -cvzf docs.tar.gz docs+ cp -a target/site/apidocs reference+ tar -cvzf reference.tar.gz reference
- name: Upload binaries
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
@@ -410,12 +409,12 @@ jobs:
- name: Upload docs
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
- name: release-docs- path: docs.tar.gz+ name: reference+ path: reference.tar.gz
docs:
name: Docs
needs:
- - source+ - binaries
runs-on: ubuntu-latest
permissions:
contents: read
@@ -427,7 +426,10 @@ jobs:
- name: Download source archive
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
- name: release-source+ name: |+ release-source+ reference+ merge-multiple: true
- name: Extract source archive
run: |
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
@@ -438,13 +440,14 @@ jobs:
source venv/bin/activate
pip install -r requirements.txt
make html
+ tar -xf ../reference.tar.gz -C docs/build/html
- name: Compress into single artifact to keep directory structure
- run: tar -cvzf docs.tar.gz -C docs/build html+ run: tar -cvzf html.tar.gz -C docs/build html
- name: Upload artifacts
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
- name: release-sphinx-docs- path: docs.tar.gz+ name: release-html+ path: html.tar.gz
verify:
name: Verify
needs:

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I'll combine them.

Comment threaddocs/README.md Outdated
Comment thread.github/workflows/rc.yml Outdated
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
kou
kou approved these changes Jan 24, 2025

@koukou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

I confirmed that release-html asset has expected HTML.

@kou
kou merged commit 5559930 into apache:mainJan 24, 2025
@lidavidm
lidavidm deleted the gh-546 branch January 24, 2025 04:50
@lidavidmlidavidm added this to the 18.2.0 milestone Jan 30, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Docs] Add support for generating Sphinx based documents

2 participants

@lidavidm@kou