diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e020b5d3e..7c908b1f2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,42 +7,60 @@ jobs: runs-on: ubuntu-latest name: Jekyll Build steps: - - uses: actions/checkout@v4 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.2 - bundler-cache: true - - name: Jekyll Build - run: bundle exec jekyll build + - uses: actions/checkout@v4 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.3 + bundler-cache: true + - name: Jekyll Build + run: bundle exec jekyll build doc-build-latest: runs-on: ubuntu-latest name: Rails Doc Build (latest) steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: fetch Rails tags - run: cd rails && git fetch --depth=1 origin refs/tags/v7*:refs/tags/v7* - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.2 - bundler-cache: true - - name: Doc Build - run: rake build + - uses: actions/checkout@v4 + with: + submodules: true + - name: fetch Rails tags + run: cd rails && git fetch --depth=1 origin refs/tags/v7*:refs/tags/v7* + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.3 + bundler-cache: true + - name: Doc Build + run: rake build + + doc-build-latest-with-yjit: + runs-on: ubuntu-latest + name: Rails Doc Build (latest, with YJIT enabled) + env: + RUBY_YJIT_ENABLE: true + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: fetch Rails tags + run: cd rails && git fetch --depth=1 origin refs/tags/v7*:refs/tags/v7* + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.3 + bundler-cache: true + - name: Doc Build + run: rake build doc-build-others: runs-on: ubuntu-latest name: Rails Doc Build (older versions) steps: - - uses: actions/checkout@v4 - with: - submodules: true - - name: fetch Rails tags - run: cd rails && git fetch --depth=1 origin refs/tags/v7*:refs/tags/v7* refs/tags/v6*:refs/tags/v6* refs/tags/v5*:refs/tags/v5* - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.7 - bundler-cache: true - - name: Doc Build - run: rake build_multi + - uses: actions/checkout@v4 + with: + submodules: true + - name: fetch Rails tags + run: cd rails && git fetch --depth=1 origin refs/tags/v7*:refs/tags/v7* refs/tags/v6*:refs/tags/v6* refs/tags/v5*:refs/tags/v5* + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7 + bundler-cache: true + - name: Doc Build + run: rake build_multi diff --git a/Gemfile.lock b/Gemfile.lock index 5674edb8e4..62fc92910d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -11,17 +11,17 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) colorator (1.1.0) commonmarker (0.23.10) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) dnsruby (1.72.1) simpleidn (~> 0.2.1) @@ -38,7 +38,8 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - ffi (1.16.3) + ffi (1.17.0) + ffi (1.17.0-arm64-darwin) forwardable-extended (2.6.0) gemoji (4.1.0) github-pages (231) @@ -218,12 +219,12 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.6) + mini_portile2 (2.8.7) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.22.3) + minitest (5.24.1) mutex_m (0.2.0) nokogiri (1.15.6) mini_portile2 (~> 2.8.2) @@ -233,14 +234,14 @@ GEM sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.5) + public_suffix (5.1.1) racc (1.8.0) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.3.1) + strscan rouge (3.30.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -253,8 +254,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - simpleidn (0.2.1) - unf (~> 0.1.4) + simpleidn (0.2.3) strscan (3.1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -262,13 +262,11 @@ GEM ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) unicode-display_width (1.8.0) webrick (1.8.1) PLATFORMS + arm64-darwin-23 ruby DEPENDENCIES diff --git a/_config.yml b/_config.yml index a425ca62bd..1936801e71 100644 --- a/_config.yml +++ b/_config.yml @@ -2,10 +2,10 @@ title: RailsDoc(β) description: Ruby on Rails API Documentation. url: https://railsdoc.github.io source: src -default_rails_version: '7.1.0' +default_rails_version: '7.1.3' rails_versions: "7.1": - specific_version: "7.1.0" + specific_version: "7.1.3" latest: true "7.0": specific_version: "7.0.8" diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000000..9401d3d2bd --- /dev/null +++ b/compose.yml @@ -0,0 +1,8 @@ +services: + app: + image: ruby:3.3 + working_dir: /app + volumes: + - .:/app + environment: + RUBY_YJIT_ENABLE: true diff --git a/rails b/rails index d39db5d189..36c1591bcb 160000 --- a/rails +++ b/rails @@ -1 +1 @@ -Subproject commit d39db5d1891f7509cde2efc425c9d69bbb77e670 +Subproject commit 36c1591bcb5e0ee3084759c7f42a706fe5bb7ca7 diff --git a/src/classes/AbstractController.html b/src/classes/AbstractController.html index 4654544996..4caac17ce2 100644 --- a/src/classes/AbstractController.html +++ b/src/classes/AbstractController.html @@ -5,7 +5,7 @@