Skip to content

Update compose.yml / Bump jquery to v3.7.1 / refactor Rakefile #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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
environment:
RUBY_YJIT_ENABLE: true
BUNDLE_AUTO_INSTALL: true
2 changes: 1 addition & 1 deletion src/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</div>
</div>

<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.3.1/anchor.min.js" integrity="sha512-zPB79j2C+3sFS9zcA3vg/z6bVKzJVEyu9pY5w89akQRys76zpAT2t6S3wZKla3QQ14O5l/Yt0RUQ/DHXx82Y5g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
Expand Down