This is an automated email from the ASF dual-hosted git repository. F21 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
commit 087bcc066047e6e91f958f1134a53aa06770a17d Author: Francis Chuang <[email protected]> AuthorDate: Tue Sep 15 14:54:45 2026 +1000 [CALCITE-7786] Use Jekyll docker images for site generation --- .../publish-non-release-website-updates.yml | 2 +- .../publish-site-and-javadocs-on-release.yml | 2 +- site/Gemfile.lock | 118 ++++----------------- site/docker-compose.yml | 13 ++- 4 files changed, 28 insertions(+), 107 deletions(-) diff --git a/.github/workflows/publish-non-release-website-updates.yml b/.github/workflows/publish-non-release-website-updates.yml index 8b9a2e6fb..9c85d1481 100644 --- a/.github/workflows/publish-non-release-website-updates.yml +++ b/.github/workflows/publish-non-release-website-updates.yml @@ -36,7 +36,7 @@ jobs: - name: Build site working-directory: site run: | - docker compose run build-site + docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site - uses: actions/checkout@v4 with: repository: apache/calcite-site diff --git a/.github/workflows/publish-site-and-javadocs-on-release.yml b/.github/workflows/publish-site-and-javadocs-on-release.yml index 651bbb4b3..7710087d9 100644 --- a/.github/workflows/publish-site-and-javadocs-on-release.yml +++ b/.github/workflows/publish-site-and-javadocs-on-release.yml @@ -29,7 +29,7 @@ jobs: - name: Build site working-directory: site run: | - docker compose run build-site + docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site - name: Build javadoc working-directory: site run: | diff --git a/site/Gemfile.lock b/site/Gemfile.lock index a70b53d02..efa6f706f 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -4,46 +4,21 @@ GEM addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) base64 (0.2.0) - bigdecimal (3.1.9) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.3.7) + concurrent-ruby (1.3.8) csv (3.3.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.17.1) - ffi (1.17.1-aarch64-linux-gnu) - ffi (1.17.1-aarch64-linux-musl) - ffi (1.17.1-arm-linux-gnu) - ffi (1.17.1-arm-linux-musl) - ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86-linux-gnu) - ffi (1.17.1-x86-linux-musl) - ffi (1.17.1-x86_64-darwin) - ffi (1.17.1-x86_64-linux-gnu) - ffi (1.17.1-x86_64-linux-musl) + ffi (1.17.4-x86_64-linux-gnu) forwardable-extended (2.6.0) - google-protobuf (4.29.3) + google-protobuf (4.36.1-x86_64-linux-gnu) bigdecimal - rake (>= 13) - google-protobuf (4.29.3-aarch64-linux) - bigdecimal - rake (>= 13) - google-protobuf (4.29.3-arm64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.29.3-x86-linux) - bigdecimal - rake (>= 13) - google-protobuf (4.29.3-x86_64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.29.3-x86_64-linux) - bigdecimal - rake (>= 13) - http_parser.rb (0.8.0) - i18n (1.14.7) + rake (~> 13.3) + http_parser.rb (0.8.1) + i18n (1.15.2) concurrent-ruby (~> 1.0) jekyll (4.4.1) addressable (~> 2.4) @@ -70,90 +45,37 @@ GEM sass-embedded (~> 1.75) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.19.9) - kramdown (2.5.1) - rexml (>= 3.3.9) + json (2.9.1) + kramdown (2.5.2) + rexml (>= 3.4.4) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.9.0) + listen (3.10.0) + logger rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.4) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (7.0.5) - rake (13.2.1) + rake (13.4.2) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.4.2) - rouge (4.5.1) + rexml (3.4.4) + rouge (4.7.0) safe_yaml (1.0.5) - sass-embedded (1.85.0) - google-protobuf (~> 4.29) - rake (>= 13) - sass-embedded (1.85.0-aarch64-linux-android) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-aarch64-linux-gnu) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-aarch64-linux-musl) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-aarch64-mingw-ucrt) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-arm-linux-androideabi) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-arm-linux-gnueabihf) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-arm-linux-musleabihf) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-arm64-darwin) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-riscv64-linux-android) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-riscv64-linux-gnu) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-riscv64-linux-musl) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-x86_64-cygwin) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-x86_64-darwin) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-x86_64-linux-android) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-x86_64-linux-gnu) - google-protobuf (~> 4.29) - sass-embedded (1.85.0-x86_64-linux-musl) - google-protobuf (~> 4.29) + sass-embedded (1.104.0-x86_64-linux-gnu) + google-protobuf (~> 4.31) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) unicode-display_width (2.6.0) - webrick (1.9.1) + webrick (1.9.2) PLATFORMS - aarch64-linux - aarch64-linux-android - aarch64-linux-gnu - aarch64-linux-musl - aarch64-mingw-ucrt - arm-linux-androideabi - arm-linux-gnu - arm-linux-gnueabihf - arm-linux-musl - arm-linux-musleabihf - arm64-darwin - riscv64-linux-android - riscv64-linux-gnu - riscv64-linux-musl - ruby - x86-linux - x86-linux-gnu - x86-linux-musl - x86_64-cygwin - x86_64-darwin - x86_64-linux-android x86_64-linux-gnu - x86_64-linux-musl DEPENDENCIES jekyll (~> 4) @@ -161,4 +83,4 @@ DEPENDENCIES webrick (~> 1.9.1) BUNDLED WITH - 2.5.22 + 2.6.9 diff --git a/site/docker-compose.yml b/site/docker-compose.yml index a84e04e76..1661df523 100644 --- a/site/docker-compose.yml +++ b/site/docker-compose.yml @@ -16,18 +16,17 @@ # services: dev: - image: ruby:3.3.7-slim-bullseye - working_dir: /root - command: sh -c "apt-get update && apt-get install -y build-essential git libssl-dev zlib1g-dev ruby-dev bundler && ./add-avatica-go-docs.sh && bundle install && bundle exec jekyll serve --host=0.0.0.0 --watch --force_polling" + image: jekyll/jekyll:4 + command: sh -c "./add-avatica-go-docs.sh; jekyll serve --host 0.0.0.0 --watch --force_polling" ports: - 4000:4000 volumes: - - .:/root + - .:/srv/jekyll build-site: - image: ruby:3.3.7-slim-bullseye - command: sh -c "rm -rf /home/jekyll/.bundle /home/jekyll/Gemfile.lock /home/jekyll/.jekyll-cache /home/target/ && apt-get update && apt-get install -y build-essential git libssl-dev zlib1g-dev ruby-dev bundler && cd /home/jekyll && ./add-avatica-go-docs.sh && bundle install && bundle exec jekyll build && chmod -R 777 ." + image: jekyll/jekyll:4 + command: sh -c "./add-avatica-go-docs.sh; jekyll build" volumes: - - .:/home/jekyll + - .:/srv/jekyll generate-javadoc: image: eclipse-temurin:8 working_dir: /usr/src/calcite-avatica
