[SPARK-56015][INFRA][DOCS] Cleanup docs container, remove unused R deps, and fix x86 build.#54974
Open
holdenk wants to merge 11 commits intoapache:masterfrom
Open
[SPARK-56015][INFRA][DOCS] Cleanup docs container, remove unused R deps, and fix x86 build.#54974holdenk wants to merge 11 commits intoapache:masterfrom
holdenk wants to merge 11 commits intoapache:masterfrom
Conversation
Co-authored-by: Holden Karau <holden@pigscanfly.ca>
…th root permissions, fix we use Python 3.12 not 3.11 anymore, handle amd64/arm64 builds Co-authored-by: Holden Karau <holden@pigscanfly.ca>
… bind mount permissions Co-authored-by: Holden Karau <holden@pigscanfly.ca>
… out of scope for fixing that here today lets just get the current system working again on x86. Co-authored-by: Holden Karau <holden@pigscanfly.ca>
Co-authored-by: Holden Karau <holden@pigscanfly.ca>
Co-authored-by: Holden Karau <holden@pigscanfly.ca>
Co-authored-by: Holden Karau <holden@pigscanfly.ca>
…witch on uname -m Co-authored-by: Holden Karau <holden@pigscanfly.ca>
…structed in the dockerfile. Co-authored-by: Holden Karau <holden@pigscanfly.ca>
…ols install. Co-authored-by: Holden Karau <holden@pigscanfly.ca>
…is to run on my machine, add bundle install Co-authored-by: Holden Karau <holden@pigscanfly.ca>
holdenk
force-pushed
the
SPARK-56015-remove-r-deps-from-docs-container-r2
branch
from
0af964a to
b28b08a
Compare
holdenk
changed the title
Member
|
@holdenk ? 
|
Contributor
Author
|
I'll rebase that's weird |
|
|
||
| # 3.Build docs on container: `error docs`, `scala doc`, `python doc`, `sql doc`. | ||
| docker run \ | ||
| --user "$(id -u):$(id -g)" \ |
Member
There was a problem hiding this comment.
Is this required additionally?
| set -ex | ||
| _arch="$(uname -m)" | ||
| case "$_arch" in | ||
| "aarch64") export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64 ;; |
Member
There was a problem hiding this comment.
This is a nice improvement but looks orthogonal to this topic. Could you proceed this independently as a spin-off? Then, we can merge aarch64 support quickly on ubuntu-24.04-arm runner later.
| Rscript -e "devtools::install_version('preferably', version='0.4', repos='https://cloud.r-project.org')" | ||
|
|
||
| # See more in SPARK-39735 | ||
| ENV R_LIBS_SITE="/usr/local/lib/R/site-library:${R_LIBS_SITE}:/usr/lib/R/library" |
Member
There was a problem hiding this comment.
Shall we focus on this removal only in this PR?
| @@ -4,7 +4,6 @@ GEM | |||
| addressable (2.8.7) | |||
Member
There was a problem hiding this comment.
I believe we need to proceed Gemfile update independently to be safe.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Update the documentation build README, container, and steps. Takes over from #54838
Why are the changes needed?
Does this PR introduce any user-facing change?
No
How was this patch tested?
Built docs docker container locally, built docs with the doc build shell script locally, built website with docs container locally.
Was this patch authored or co-authored using generative AI tooling?