From d4f60b2f552f3888bf35d2ff0ab5f4534a7eb8d0 Mon Sep 17 00:00:00 2001 From: toshimaru Date: Sat, 23 Nov 2024 20:35:02 +0900 Subject: [PATCH 1/4] Set `BUNDLE_AUTO_INSTALL` to auto-install jekyll --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index 2a153dfe97..c0240b3b93 100644 --- a/compose.yml +++ b/compose.yml @@ -8,3 +8,4 @@ services: - .:/app environment: RUBY_YJIT_ENABLE: true + BUNDLE_AUTO_INSTALL: true From f63df025dfb086a63d5e56297af858fda7f142e6 Mon Sep 17 00:00:00 2001 From: toshimaru Date: Sat, 23 Nov 2024 22:31:09 +0900 Subject: [PATCH 2/4] Use environment variable for the image tag --- compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compose.yml b/compose.yml index c0240b3b93..94e7c30782 100644 --- a/compose.yml +++ b/compose.yml @@ -1,8 +1,7 @@ services: app: - image: ruby:3.3 - # Use Ruby 2.7 for older builds - # image: ruby:2.7 + # NOTE: Use Ruby 2.7 for older builds + image: ruby:${RUBY_VERSION:-3.3} working_dir: /app volumes: - .:/app From 21aecb25ddae6d3130bcb76ae07fd76f7885f7c2 Mon Sep 17 00:00:00 2001 From: toshimaru Date: Sat, 23 Nov 2024 22:34:34 +0900 Subject: [PATCH 3/4] Change const name --- Rakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index f96006e037..03586ad7b9 100644 --- a/Rakefile +++ b/Rakefile @@ -4,8 +4,8 @@ require 'yaml' require 'bundler' SOURCE_DIR = 'src' -INDEX_HTML = 'files/railties/RDOC_MAIN_rdoc.html' -NEW_INDEX_HTML = 'files/railties/RDOC_MAIN_md.html' +INDEX_HTML = 'files/railties/RDOC_MAIN_md.html' +OLD_INDEX_HTML = 'files/railties/RDOC_MAIN_rdoc.html' MY_SDOC_BRANCH = 'main' desc 'Generate documentation for default Rails version and build Jekyll site' @@ -85,9 +85,9 @@ def generate_src(target_version:) cd target_dir do # Generate index.html if Gem::Version.new(target_version) >= Gem::Version.new('7.1') - cp NEW_INDEX_HTML, 'index.html' - else cp INDEX_HTML, 'index.html' + else + cp OLD_INDEX_HTML, 'index.html' end # Prepend version number to the absolute path in navigation.html From f39e30cbe693f19c6342caa8ce7a711ca7b6a48a Mon Sep 17 00:00:00 2001 From: toshimaru Date: Sat, 23 Nov 2024 23:14:10 +0900 Subject: [PATCH 4/4] Bump jquery from 3.5.1 to 3.7.1 --- src/_layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_layouts/default.html b/src/_layouts/default.html index 79fd7779b6..b17a6ac9c5 100644 --- a/src/_layouts/default.html +++ b/src/_layouts/default.html @@ -68,7 +68,7 @@ - +