Merge branch 'master' into remove-defunct-rubies-and-platforms

Author: hsbt

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: ci
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
+
+    strategy:
+      matrix:
+        ruby: ["3.0"]
+        os: [ubuntu-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Dump environment
+        run: env | sort
+      - name: Checkout ruby/www.ruby-lang.org
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Dump Ruby version
+        run: ruby -v
+      - name: Run tests
+        run: bundle exec rake test

.gitignore

@@ -7,3 +7,4 @@ _site/
 vendor
 .env
 bin
+.jekyll*

.travis.yml

@@ -1,22 +1,19 @@
 source "https://rubygems.org"
-ruby ENV['CUSTOM_RUBY_VERSION'] || '~> 2.6.3'
 
-gem 'rake'
-gem 'jekyll', '~> 3.0'
-gem 'rouge',  '~> 1.10'
+ruby "~> 3.0.2"
 
-gem 'unicorn'
-gem 'lanyon', '~> 0.4.0'
-gem 'rack-rewrite'
-gem 'rack-ssl'
-gem 'rack-protection'
+gem "rake"
+gem "jekyll", "~> 4.0"
+gem "rouge"
 
-group :production do
-  gem "sqreen"
-end
+gem "unicorn"
+gem "lanyon"
+gem "rack-rewrite"
+gem "rack-ssl"
+gem "rack-protection"
 
 group :development do
-  gem 'minitest'
-  gem 'spidr', '~> 0.6'
-  gem 'validate-website', '~> 1.6'
+  gem "minitest"
+  gem "spidr", "~> 0.6"
+  gem "validate-website", "~> 1.6"
 end

Gemfile

@@ -1,117 +1,125 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.10.0)
+    ffi (1.15.4)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    http_parser.rb (0.8.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (4.2.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+      terminal-table (~> 2.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.2.0)
-    kgio (2.11.2)
-    kramdown (1.17.0)
-    lanyon (0.4.0)
-      jekyll (>= 2.0, < 4.0)
+    json (2.6.1)
+    kgio (2.11.4)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    lanyon (0.4.3)
+      jekyll (>= 2.0)
       rack (>= 1.6, < 3.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    paint (2.1.0)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogumbo (2.0.5)
+      nokogiri (~> 1.8, >= 1.8.4)
+    paint (2.2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rack (2.0.7)
-    rack-protection (2.0.5)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
-    raindrops (0.19.0)
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    raindrops (0.20.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (1.11.1)
-    ruby_dep (1.5.0)
+    rexml (3.2.5)
+    rouge (3.27.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    slop (4.6.2)
-    spidr (0.6.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    slop (4.9.1)
+    spidr (0.6.1)
       nokogiri (~> 1.3)
-    sq_mini_racer (0.2.4.sqreen3)
-    sqreen (1.17.0)
-      sq_mini_racer (~> 0.2.4.sqreen2)
-    tidy_ffi (1.0.0)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tidy_ffi (1.0.1)
       ffi (~> 1.2)
-    unicorn (5.5.0)
+    unicode-display_width (1.8.0)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    validate-website (1.9.3)
+    validate-website (1.11.1)
       crass (~> 1)
+      nokogumbo (~> 2.0)
       paint (~> 2)
       slop (~> 4.6)
       spidr (~> 0.6)
       tidy_ffi (~> 1.0)
       w3c_validators (~> 1.3)
-    w3c_validators (1.3.4)
+      webrick (~> 1)
+    w3c_validators (1.3.6)
       json (>= 1.8)
       nokogiri (~> 1.6)
+      rexml (~> 3.2)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.0)
-  lanyon (~> 0.4.0)
+  jekyll (~> 4.0)
+  lanyon
   minitest
   rack-protection
   rack-rewrite
   rack-ssl
   rake
-  rouge (~> 1.10)
+  rouge
   spidr (~> 0.6)
-  sqreen
   unicorn
   validate-website (~> 1.6)
 
 RUBY VERSION
-   ruby 2.6.3p62
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.0.1
+   2.2.31

Gemfile.lock

@@ -3,7 +3,7 @@ www.ruby-lang.org
 
 [![Join the chat at https://gitter.im/ruby/www.ruby-lang.org](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ruby/www.ruby-lang.org?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Build Status](https://travis-ci.org/ruby/www.ruby-lang.org.svg?branch=master)](https://travis-ci.org/ruby/www.ruby-lang.org)
+[![Build Status](https://github.com/ruby/www.ruby-lang.org/workflows/ci/badge.svg)](https://github.com/ruby/www.ruby-lang.org/actions?query=branch%3Amaster)
 
 This is the [Jekyll](http://www.jekyllrb.com/) source of
 the [www.ruby-lang.org](https://www.ruby-lang.org/) website.
@@ -70,6 +70,14 @@ in your browser to access the preview.
 
 **Note:** The build of the site will take several minutes.
 
+Alternatively, you can use Jekyll directly.
+
+```
+bundle exec jekyll serve --watch --future --incremental
+```
+
+If your draft uses future date, you may want to use `--future` option.
+
 ### Preview on Heroku
 
 In case a build is not possible on your local machine
@@ -112,7 +120,7 @@ Besides generating and previewing the site
 you can perform additional tests with these tasks:
 
 ``` sh
-bundle exec rake check         # perform various tests on the source files
+bundle exec rake lint          # run linter on markdown files
 bundle exec rake check:markup  # check markup for all generated pages
 bundle exec rake check:links   # check for 404's (needs a running local server)
 ```