diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 81e006904f..34d587cd8a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,14 @@ version: 2 updates: -- package-ecosystem: bundler - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 + - package-ecosystem: bundler + directory: "/" + schedule: + interval: weekly + reviewers: + - toshimaru + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly + reviewers: + - toshimaru diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7f660a36d..b67eddadfe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Jekyll Build run: bundle exec jekyll build - doc-build: + doc-build-latest: runs-on: ubuntu-latest name: Rails Doc Build steps: @@ -24,7 +24,7 @@ jobs: submodules: true - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.1 bundler-cache: true - name: Doc Build run: | diff --git a/Gemfile.lock b/Gemfile.lock index d7ad7aeaf6..a920408177 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,4 +269,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.16 + 2.4.1 diff --git a/Rakefile b/Rakefile index 65410062e8..cf26f354d1 100644 --- a/Rakefile +++ b/Rakefile @@ -3,10 +3,10 @@ require 'yaml' require 'bundler' -SOURCE_DIR = "src" +SOURCE_DIR = 'src' INDEX_HTML = 'files/railties/RDOC_MAIN_rdoc.html' -desc "Build railsdoc" +desc 'Build railsdoc' task :build do generate_rails_rdoc generate_src @@ -14,18 +14,18 @@ task :build do sh 'bundle exec jekyll build' end -desc "Switch to default Rails version" +desc 'Switch to default Rails version' task :switch_default_rails do - switch_rails(config["default_rails_version"]) + switch_rails(config['default_rails_version']) end desc "Build another version's railsdoc" task :build_multi do - config["rails_versions"].each do |version, detail| + config['rails_versions'].each do |version, detail| dir = "#{SOURCE_DIR}/#{version}" mkdir dir unless Dir.exist?(dir) - bulid_version = detail["specific_version"] + bulid_version = detail['specific_version'] switch_rails(bulid_version) generate_rails_rdoc generate_src(target_version: version) @@ -38,7 +38,7 @@ end def switch_rails(version) cd 'rails' do - sh "git reset --hard" + sh 'git reset --hard' sh "git switch refs/tags/v#{version} -C v#{version}" end end @@ -46,10 +46,13 @@ end def generate_rails_rdoc cd 'rails' do Bundler.with_unbundled_env do + # TODO: use `BUNDLE_ONLY`(require bundler 2.3.19+). + ENV['BUNDLE_WITHOUT'] = 'db:job:storage' + # replace sdoc gem - gemfile = File.read("Gemfile") + gemfile = File.read('Gemfile') gemfile.gsub!(/"sdoc.*$/, '"sdoc", github: "toshimaru/sdoc", branch: "railsdoc"') - File.write("Gemfile", gemfile) + File.write('Gemfile', gemfile) sh 'bundle install && bundle update sdoc' rm_rf 'doc' @@ -59,7 +62,7 @@ def generate_rails_rdoc end def generate_src(target_version: nil) - copy_sources = Dir.glob('rails/doc/rdoc/*').reject { |path| path.end_with?("panel", "js", "created.rid") } + copy_sources = Dir.glob('rails/doc/rdoc/*').reject { |path| path.end_with?('panel', 'js', 'created.rid') } target_dir = "#{SOURCE_DIR}/#{target_version}" cp_r copy_sources, target_dir @@ -69,8 +72,8 @@ def generate_src(target_version: nil) return if target_version.nil? # Replace absolute path in navigation.html - content = File.read("navigation.html") - content.gsub!("