Skip to content

Commit 739bbda

Browse files
hsbthsbt
authored
Merge branch 'master' into remove-broken-lucent-website-links
2 parents 74b6f79 + e573e1b commit 739bbda

File tree

506 files changed

+24028
-3098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

506 files changed

+24028
-3098
lines changed

‎.github/workflows/ci.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: ci
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
name: build (${{ matrix.ruby }} / ${{ matrix.os }})
8+
9+
strategy:
10+
matrix:
11+
ruby: [2.6, 2.7]
12+
os: [ubuntu-latest, macos-latest]
13+
fail-fast: false
14+
15+
runs-on: ${{ matrix.os }}
16+
17+
steps:
18+
- name: Dump environment
19+
run: env | sort
20+
- name: Checkout ruby/www.ruby-lang.org
21+
uses: actions/checkout@v1
22+
with:
23+
fetch-depth: 1
24+
- name: Setup Ruby
25+
uses: ruby/setup-ruby@v1
26+
with:
27+
ruby-version: ${{ matrix.ruby }}
28+
architecture: x64
29+
- name: Dump Ruby version
30+
run: ruby -v
31+
# override the Ruby version specified in the Gemfile
32+
- name: Set CUSTOM_RUBY_VERSION for Gemfile
33+
run: echo ::set-env name=CUSTOM_RUBY_VERSION::$(ruby -e 'puts RUBY_VERSION')
34+
- name: Dump CUSTOM_RUBY_VERSION
35+
run: echo $CUSTOM_RUBY_VERSION
36+
- name: Cache gem bundle
37+
uses: actions/cache@v1
38+
with:
39+
path: vendor/bundle
40+
key: ${{ runner.os }}-${{ matrix.ruby }}-bundle-${{ hashFiles('Gemfile.lock') }}
41+
- name: Install bundler
42+
run: gem install bundler --no-document
43+
- name: Install gem bundle
44+
run: |
45+
bundle config set path 'vendor/bundle'
46+
bundle install
47+
- name: Run tests
48+
run: bundle exec rake test

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: ruby
22
sudo: false
3-
rvm: 2.6.5
3+
rvm: 2.7.0
44
cache: bundler
55
env:
6-
- TASK=ci
6+
- TASK=test
77
before_install: gem install bundler:2.0.2
88
script: bundle exec rake $TASK
99
# Notifications, used by our Gitter channel.

‎Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
source "https://rubygems.org"
2-
ruby ENV['CUSTOM_RUBY_VERSION'] || '~> 2.6.5'
2+
ruby ENV['CUSTOM_RUBY_VERSION'] || '~> 2.7.0'
33

44
gem 'rake'
5-
gem 'jekyll'
5+
gem 'jekyll', '~> 4.0'
66
gem 'rouge'
77

88
gem 'unicorn'
9-
gem 'lanyon', git: "https://github.com/hsbt/lanyon", ref: "b84d5338b7e4138319311591c41ae41a66dcd3e8"
9+
gem 'lanyon'
1010
gem 'rack-rewrite'
1111
gem 'rack-ssl'
1212
gem 'rack-protection'

‎Gemfile.lock

+16-20
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1-
GIT
2-
remote: https://github.com/hsbt/lanyon
3-
revision: b84d5338b7e4138319311591c41ae41a66dcd3e8
4-
ref: b84d5338b7e4138319311591c41ae41a66dcd3e8
5-
specs:
6-
lanyon (0.4.0)
7-
jekyll (>= 2.0, < 5.0)
8-
rack (>= 1.6, < 3.0)
9-
101
GEM
112
remote: https://rubygems.org/
123
specs:
134
addressable (2.7.0)
145
public_suffix (>= 2.0.2, < 5.0)
156
colorator (1.1.0)
167
concurrent-ruby (1.1.5)
17-
crass (1.0.4)
8+
crass (1.0.5)
189
em-websocket (0.5.1)
1910
eventmachine (>= 0.12.9)
2011
http_parser.rb (~> 0.6.0)
@@ -48,20 +39,24 @@ GEM
4839
kramdown (2.1.0)
4940
kramdown-parser-gfm (1.1.0)
5041
kramdown (~> 2.0)
42+
lanyon (0.4.1)
43+
jekyll (>= 2.0)
44+
rack (>= 1.6, < 3.0)
45+
libsqreen (0.3.0.0.3)
5146
liquid (4.0.3)
5247
listen (3.2.0)
5348
rb-fsevent (~> 0.10, >= 0.10.3)
5449
rb-inotify (~> 0.9, >= 0.9.10)
5550
mercenary (0.3.6)
5651
mini_portile2 (2.4.0)
57-
minitest (5.12.2)
58-
nokogiri (1.10.4)
52+
minitest (5.13.0)
53+
nokogiri (1.10.8)
5954
mini_portile2 (~> 2.4.0)
6055
paint (2.1.1)
6156
pathutil (0.16.2)
6257
forwardable-extended (~> 2.6)
6358
public_suffix (4.0.1)
64-
rack (2.0.7)
59+
rack (2.0.8)
6560
rack-protection (2.0.7)
6661
rack
6762
rack-rewrite (1.5.1)
@@ -72,15 +67,16 @@ GEM
7267
rb-fsevent (0.10.3)
7368
rb-inotify (0.10.0)
7469
ffi (~> 1.0)
75-
rouge (3.11.1)
70+
rouge (3.12.0)
7671
safe_yaml (1.0.5)
7772
sassc (2.2.1)
7873
ffi (~> 1.9)
7974
slop (4.7.0)
80-
spidr (0.6.0)
75+
spidr (0.6.1)
8176
nokogiri (~> 1.3)
82-
sq_mini_racer (0.2.5.0.1.beta1)
83-
sqreen (1.17.2)
77+
sq_mini_racer (0.2.5.0.1.beta2)
78+
sqreen (1.18.1)
79+
libsqreen (~> 0.3.0.0)
8480
sq_mini_racer (~> 0.2.4.sqreen2)
8581
terminal-table (1.8.0)
8682
unicode-display_width (~> 1.1, >= 1.1.1)
@@ -105,8 +101,8 @@ PLATFORMS
105101
ruby
106102

107103
DEPENDENCIES
108-
jekyll
109-
lanyon!
104+
jekyll (~> 4.0)
105+
lanyon
110106
minitest
111107
rack-protection
112108
rack-rewrite
@@ -119,7 +115,7 @@ DEPENDENCIES
119115
validate-website (~> 1.6)
120116

121117
RUBY VERSION
122-
ruby 2.6.5p114
118+
ruby 2.7.0p0
123119

124120
BUNDLED WITH
125121
2.0.2

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ www.ruby-lang.org
33

44
[![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)
55

6+
[![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)
7+
68
[![Build Status](https://travis-ci.org/ruby/www.ruby-lang.org.svg?branch=master)](https://travis-ci.org/ruby/www.ruby-lang.org)
79

810
This is the [Jekyll](http://www.jekyllrb.com/) source of
@@ -120,7 +122,7 @@ Besides generating and previewing the site
120122
you can perform additional tests with these tasks:
121123

122124
``` sh
123-
bundle exec rake check # perform various tests on the source files
125+
bundle exec rake lint # run linter on markdown files
124126
bundle exec rake check:markup # check markup for all generated pages
125127
bundle exec rake check:links # check for 404's (needs a running local server)
126128
```

‎Rakefile

+10-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ LANGUAGES = %w[bg de en es fr id it ja ko pl pt ru tr vi zh_cn zh_tw]
1212
CONFIG = "_config.yml"
1313

1414
task :default => [:build]
15-
task :ci => [:test, :build]
15+
16+
desc "Run tests (lint, build)"
17+
task :test => [:lint, :build]
1618

1719
desc "Build the Jekyll site"
1820
task :build do
@@ -104,11 +106,8 @@ namespace :new_post do
104106
end
105107
end
106108

107-
desc "Alias for `check'"
108-
task :test => [:check]
109-
110-
desc "Run some tests on markdown files"
111-
task :check do
109+
desc "Run linter on markdown files"
110+
task :lint do
112111
require_relative "lib/linter"
113112
Linter.new.run
114113
end
@@ -129,3 +128,8 @@ namespace :check do
129128
MarkupChecker.new.check
130129
end
131130
end
131+
132+
desc "Run tests for the Linter library"
133+
task :"test-linter" do
134+
ruby "test/test_linter.rb"
135+
end

0 commit comments

Comments
 (0)