This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 9a2818820f11 [SPARK-48222][INFRA][DOCS] Sync Ruby Bundler to 2.4.22
and refresh Gem lock file
9a2818820f11 is described below
commit 9a2818820f11f9bdcc042f4ab80850918911c68c
Author: Nicholas Chammas <nicholas.cham...@gmail.com>
AuthorDate: Fri May 10 09:58:16 2024 +0800
[SPARK-48222][INFRA][DOCS] Sync Ruby Bundler to 2.4.22 and refresh Gem lock
file
### What changes were proposed in this pull request?
Sync the version of Bundler that we are using across various scripts and
documentation. Also refresh the Gem lock file.
### Why are the changes needed?
We are seeing inconsistent build behavior, likely due to the inconsistent
Bundler versions.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
CI + the preview release process.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #46512 from nchammas/bundler-sync.
Authored-by: Nicholas Chammas <nicholas.cham...@gmail.com>
Signed-off-by: Wenchen Fan <wenc...@databricks.com>
---
.github/workflows/build_and_test.yml | 3 +++
dev/create-release/spark-rm/Dockerfile | 2 +-
docs/Gemfile.lock | 16 ++++++++--------
docs/README.md | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 4a11823aee60..881fb8cb0674 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -872,6 +872,9 @@ jobs:
python3.9 -m pip install 'docutils<0.18.0' # See SPARK-39421
- name: Install dependencies for documentation generation
run: |
+ # Keep the version of Bundler here in sync with the following
locations:
+ # - dev/create-release/spark-rm/Dockerfile
+ # - docs/README.md
gem install bundler -v 2.4.22
cd docs
bundle install
diff --git a/dev/create-release/spark-rm/Dockerfile
b/dev/create-release/spark-rm/Dockerfile
index 8d5ca38ba88e..13f4112ca03d 100644
--- a/dev/create-release/spark-rm/Dockerfile
+++ b/dev/create-release/spark-rm/Dockerfile
@@ -38,7 +38,7 @@ ENV DEBCONF_NONINTERACTIVE_SEEN true
ARG APT_INSTALL="apt-get install --no-install-recommends -y"
ARG PIP_PKGS="sphinx==4.5.0 mkdocs==1.1.2 numpy==1.20.3
pydata_sphinx_theme==0.13.3 ipython==7.19.0 nbsphinx==0.8.0 numpydoc==1.1.0
jinja2==3.1.2 twine==3.4.1 sphinx-plotly-directive==0.1.3
sphinx-copybutton==0.5.2 pandas==2.0.3 pyarrow==10.0.1 plotly==5.4.0
markupsafe==2.0.1 docutils<0.17 grpcio==1.62.0 protobuf==4.21.6
grpcio-status==1.62.0 googleapis-common-protos==1.56.4"
-ARG GEM_PKGS="bundler:2.3.8"
+ARG GEM_PKGS="bundler:2.4.22"
# Install extra needed repos and refresh.
# - CRAN repo
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 4e38f18703f3..e137f0f039b9 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -4,16 +4,16 @@ GEM
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
- concurrent-ruby (1.2.2)
+ concurrent-ruby (1.2.3)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.16.3)
forwardable-extended (2.6.0)
- google-protobuf (3.25.2)
+ google-protobuf (3.25.3)
http_parser.rb (0.8.0)
- i18n (1.14.1)
+ i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
addressable (~> 2.4)
@@ -42,22 +42,22 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
- listen (3.8.0)
+ listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (5.0.4)
- rake (13.1.0)
+ public_suffix (5.0.5)
+ rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (3.30.0)
safe_yaml (1.0.5)
- sass-embedded (1.69.7)
- google-protobuf (~> 3.25)
+ sass-embedded (1.63.6)
+ google-protobuf (~> 3.23)
rake (>= 13.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
diff --git a/docs/README.md b/docs/README.md
index 414c8dbd8303..363f1c207636 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -36,7 +36,7 @@ You need to have [Ruby 3][ruby] and [Python 3][python]
installed. Make sure the
[python]: https://www.python.org/downloads/
```sh
-$ gem install bundler
+$ gem install bundler -v 2.4.22
```
After this all the required Ruby dependencies can be installed from the
`docs/` directory via Bundler:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
