History

Merge 'main' into fix-redis-sort-set-missing

Simon Legner committed 3 years ago

Commit 06dcb922 parents 21f3a9b e8dcd1415 files · +47 −37Browse files

Unified · Split

15 files
  1. .github/workflows/build.yml +2 −2
  2. .github/workflows/schedule-doc-report.yml +2 −2
  3. .github/workflows/test.yml +2 −2
  4. .ruby-version +1 −1
  5. .tool-versions +1 −1
  6. Dockerfile +1 −1
  7. Dockerfile-alpine +1 −1
  8. Gemfile +1 −1
  9. Gemfile.lock +20 −20
  10. lib/docs/scrapers/django.rb +5 −0
  11. lib/docs/scrapers/fastapi.rb +1 −1
  12. lib/docs/scrapers/git.rb +1 −1
  13. lib/docs/scrapers/octave.rb +6 −1
  14. lib/docs/scrapers/typescript.rb +2 −2
  15. lib/docs/scrapers/vitest.rb +1 −1
.github/workflows/build.yml+2−2
@@ -11,9 +11,9 @@ jobs: · 10 unmodified lines
11 runs-on: ubuntu-20.0411 runs-on: ubuntu-20.04
12 if: github.repository == 'freeCodeCamp/devdocs'12 if: github.repository == 'freeCodeCamp/devdocs'
13 steps:13 steps:
14 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.014 - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
15 - name: Set up Ruby15 - name: Set up Ruby
16 uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.016 uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
17 with:17 with:
18 bundler-cache: true # runs 'bundle install' and caches installed gems automatically18 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
19 - name: Run tests19 - name: Run tests
.github/workflows/schedule-doc-report.yml+2−2
@@ -8,9 +8,9 @@ jobs: · 7 unmodified lines
8 runs-on: ubuntu-20.048 runs-on: ubuntu-20.04
9 if: github.repository == 'freeCodeCamp/devdocs'9 if: github.repository == 'freeCodeCamp/devdocs'
10 steps:10 steps:
11 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.011 - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
12 - name: Set up Ruby12 - name: Set up Ruby
13 uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.013 uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
14 with:14 with:
15 bundler-cache: true # runs 'bundle install' and caches installed gems automatically15 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
16 - name: Generate report16 - name: Generate report
.github/workflows/test.yml+2−2
@@ -9,9 +9,9 @@ jobs: · 8 unmodified lines
9 test:9 test:
10 runs-on: ubuntu-20.0410 runs-on: ubuntu-20.04
11 steps:11 steps:
12 - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.012 - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
13 - name: Set up Ruby13 - name: Set up Ruby
14 uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.014 uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
15 with:15 with:
16 bundler-cache: true # runs 'bundle install' and caches installed gems automatically16 bundler-cache: true # runs 'bundle install' and caches installed gems automatically
17 - name: Run tests17 - name: Run tests
.ruby-version+1−1
@@ -1 +1 @@
13.2.113.2.2
.tool-versions+1−1
@@ -1 +1 @@
1ruby 3.2.11ruby 3.2.2
Dockerfile+1−1
@@ -1,4 +1,4 @@
1FROM ruby:3.2.11FROM ruby:3.2.2
2ENV LANG=C.UTF-82ENV LANG=C.UTF-8
3ENV ENABLE_SERVICE_WORKER=true3ENV ENABLE_SERVICE_WORKER=true
4 4
Dockerfile-alpine+1−1
@@ -1,4 +1,4 @@
1FROM ruby:3.2.1-alpine1FROM ruby:3.2.2-alpine
2 2
3ENV LANG=C.UTF-83ENV LANG=C.UTF-8
4ENV ENABLE_SERVICE_WORKER=true4ENV ENABLE_SERVICE_WORKER=true
Gemfile+1−1
@@ -1,5 +1,5 @@
1source 'https://rubygems.org'1source 'https://rubygems.org'
2ruby '3.2.1'2ruby '3.2.2'
3 3
4gem 'activesupport', require: false4gem 'activesupport', require: false
5gem 'html-pipeline'5gem 'html-pipeline'
Gemfile.lock+20−20
@@ -1,7 +1,7 @@
1GEM1GEM
2 remote: https://rubygems.org/2 remote: https://rubygems.org/
3 specs:3 specs:
4 activesupport (7.0.4.2)4 activesupport (7.0.4.3)
5 concurrent-ruby (~> 1.0, >= 1.0.2)5 concurrent-ruby (~> 1.0, >= 1.0.2)
6 i18n (>= 1.6, < 2)6 i18n (>= 1.6, < 2)
7 minitest (>= 5.1)7 minitest (>= 5.1)
@@ -20,7 +20,7 @@ GEM · 12 unmodified lines
20 coffee-script-source (1.12.2)20 coffee-script-source (1.12.2)
21 concurrent-ruby (1.1.10)21 concurrent-ruby (1.1.10)
22 daemons (1.4.1)22 daemons (1.4.1)
23 erubi (1.11.0)23 erubi (1.12.0)
24 ethon (0.16.0)24 ethon (0.16.0)
25 ffi (>= 1.15.0)25 ffi (>= 1.15.0)
26 eventmachine (1.2.7)26 eventmachine (1.2.7)
@@ -40,22 +40,22 @@ GEM · 13 unmodified lines
40 image_size (>= 1.5, < 4)40 image_size (>= 1.5, < 4)
41 in_threads (~> 1.3)41 in_threads (~> 1.3)
42 progress (~> 3.0, >= 3.0.1)42 progress (~> 3.0, >= 3.0.1)
43 image_optim_pack (0.9.1.20221104)43 image_optim_pack (0.9.1.20230325)
44 fspath (>= 2.1, < 4)44 fspath (>= 2.1, < 4)
45 image_optim (~> 0.19)45 image_optim (~> 0.19)
46 image_size (3.2.0)46 image_size (3.2.0)
47 in_threads (1.6.0)47 in_threads (1.6.0)
48 method_source (1.0.0)48 method_source (1.0.0)
49 mini_portile2 (2.8.0)49 mini_portile2 (2.8.1)
50 minitest (5.16.3)50 minitest (5.18.0)
51 multi_json (1.15.0)51 multi_json (1.15.0)
52 mustermann (3.0.0)52 mustermann (3.0.0)
53 ruby2_keywords (~> 0.0.1)53 ruby2_keywords (~> 0.0.1)
54 net-sftp (4.0.0)54 net-sftp (4.0.0)
55 net-ssh (>= 5.0.0, < 8.0.0)55 net-ssh (>= 5.0.0, < 8.0.0)
56 net-ssh (7.0.1)56 net-ssh (7.0.1)
57 newrelic_rpm (8.12.0)57 newrelic_rpm (8.16.0)
58 nokogiri (1.14.2)58 nokogiri (1.14.3)
59 mini_portile2 (~> 2.8.0)59 mini_portile2 (~> 2.8.0)
60 racc (~> 1.4)60 racc (~> 1.4)
61 options (2.3.2)61 options (2.3.2)
@@ -63,24 +63,24 @@ GEM · 1 unmodified line
63 progress_bar (1.3.3)63 progress_bar (1.3.3)
64 highline (>= 1.6, < 3)64 highline (>= 1.6, < 3)
65 options (~> 2.3.0)65 options (~> 2.3.0)
66 pry (0.14.1)66 pry (0.14.2)
67 coderay (~> 1.1)67 coderay (~> 1.1)
68 method_source (~> 1.0)68 method_source (~> 1.0)
69 pry-byebug (3.10.1)69 pry-byebug (3.10.1)
70 byebug (~> 11.0)70 byebug (~> 11.0)
71 pry (>= 0.13, < 0.15)71 pry (>= 0.13, < 0.15)
72 racc (1.6.1)72 racc (1.6.2)
73 rack (2.2.6.3)73 rack (2.2.6.4)
74 rack-protection (3.0.3)74 rack-protection (3.0.5)
75 rack75 rack
76 rack-ssl-enforcer (0.2.9)76 rack-ssl-enforcer (0.2.9)
77 rack-test (2.0.2)77 rack-test (2.1.0)
78 rack (>= 1.3)78 rack (>= 1.3)
79 rake (13.0.6)79 rake (13.0.6)
80 rb-fsevent (0.11.2)80 rb-fsevent (0.11.2)
81 rb-inotify (0.10.1)81 rb-inotify (0.10.1)
82 ffi (~> 1.0)82 ffi (~> 1.0)
83 redcarpet (3.5.1)83 redcarpet (3.6.0)
84 rexml (3.2.5)84 rexml (3.2.5)
85 rr (3.1.0)85 rr (3.1.0)
86 rss (0.2.9)86 rss (0.2.9)
@@ -91,16 +91,16 @@ GEM · 4 unmodified lines
91 sass-listen (4.0.0)91 sass-listen (4.0.0)
92 rb-fsevent (~> 0.9, >= 0.9.4)92 rb-fsevent (~> 0.9, >= 0.9.4)
93 rb-inotify (~> 0.9, >= 0.9.7)93 rb-inotify (~> 0.9, >= 0.9.7)
94 sinatra (3.0.3)94 sinatra (3.0.5)
95 mustermann (~> 3.0)95 mustermann (~> 3.0)
96 rack (~> 2.2, >= 2.2.4)96 rack (~> 2.2, >= 2.2.4)
97 rack-protection (= 3.0.3)97 rack-protection (= 3.0.5)
98 tilt (~> 2.0)98 tilt (~> 2.0)
99 sinatra-contrib (3.0.3)99 sinatra-contrib (3.0.5)
100 multi_json100 multi_json
101 mustermann (~> 3.0)101 mustermann (~> 3.0)
102 rack-protection (= 3.0.3)102 rack-protection (= 3.0.5)
103 sinatra (= 3.0.3)103 sinatra (= 3.0.5)
104 tilt (~> 2.0)104 tilt (~> 2.0)
105 sprockets (3.7.2)105 sprockets (3.7.2)
106 concurrent-ruby (~> 1.0)106 concurrent-ruby (~> 1.0)
@@ -116,7 +116,7 @@ GEM · 9 unmodified lines
116 strings-ansi (0.2.0)116 strings-ansi (0.2.0)
117 terminal-table (3.0.2)117 terminal-table (3.0.2)
118 unicode-display_width (>= 1.1.1, < 3)118 unicode-display_width (>= 1.1.1, < 3)
119 thin (1.8.1)119 thin (1.8.2)
120 daemons (~> 1.0, >= 1.0.9)120 daemons (~> 1.0, >= 1.0.9)
121 eventmachine (~> 1.0, >= 1.0.4)121 eventmachine (~> 1.0, >= 1.0.4)
122 rack (>= 1, < 3)122 rack (>= 1, < 3)
@@ -179,7 +179,7 @@ DEPENDENCIES · 56 unmodified lines
179 yajl-ruby179 yajl-ruby
180 180
181RUBY VERSION181RUBY VERSION
182 ruby 3.2.1p31182 ruby 3.2.2p53
183 183
184BUNDLED WITH184BUNDLED WITH
185 2.4.6185 2.4.6
lib/docs/scrapers/django.rb+5−0
@@ -34,6 +34,11 @@ module Docs · 33 unmodified lines
34 Licensed under the BSD License.34 Licensed under the BSD License.
35 HTML35 HTML
36 36
37 version '4.2' do
38 self.release = '4.2'
39 self.base_url = "https://docs.djangoproject.com/en/#{self.version}/"
40 end
41
37 version '4.1' do42 version '4.1' do
38 self.release = '4.1'43 self.release = '4.1'
39 self.base_url = "https://docs.djangoproject.com/en/#{self.version}/"44 self.base_url = "https://docs.djangoproject.com/en/#{self.version}/"
lib/docs/scrapers/fastapi.rb+1−1
@@ -2,7 +2,7 @@ module Docs · 1 unmodified line
2 class Fastapi < UrlScraper2 class Fastapi < UrlScraper
3 self.name = 'FastAPI'3 self.name = 'FastAPI'
4 self.type = 'fastapi'4 self.type = 'fastapi'
5 self.release = '0.88.0'5 self.release = '0.95.0'
6 self.base_url = 'https://fastapi.tiangolo.com/'6 self.base_url = 'https://fastapi.tiangolo.com/'
7 self.root_path = '/'7 self.root_path = '/'
8 self.links = {8 self.links = {
lib/docs/scrapers/git.rb+1−1
@@ -1,7 +1,7 @@
1module Docs1module Docs
2 class Git < UrlScraper2 class Git < UrlScraper
3 self.type = 'git'3 self.type = 'git'
4 self.release = '2.39.0'4 self.release = '2.40.0'
5 self.base_url = 'https://git-scm.com/docs'5 self.base_url = 'https://git-scm.com/docs'
6 self.initial_paths = %w(/git.html)6 self.initial_paths = %w(/git.html)
7 self.links = {7 self.links = {
lib/docs/scrapers/octave.rb+6−1
@@ -23,12 +23,17 @@ module Docs · 22 unmodified lines
23 options[:root_title] = 'GNU Octave'23 options[:root_title] = 'GNU Octave'
24 24
25 options[:attribution] = <<-HTML25 options[:attribution] = <<-HTML
26 &copy; 1996–2022 The Octave Project Developers<br>26 &copy; 1996–2023 The Octave Project Developers<br>
27 Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies.<br/>27 Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies.<br/>
28 Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.</br>28 Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.</br>
29 Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions.29 Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions.
30 HTML30 HTML
31 31
32 version '8' do
33 self.release = '8.1.0'
34 self.base_url = "https://docs.octave.org/v#{self.release}/"
35 end
36
32 version '7' do37 version '7' do
33 self.release = '7.2.0'38 self.release = '7.2.0'
34 self.base_url = "https://docs.octave.org/v#{self.release}/"39 self.base_url = "https://docs.octave.org/v#{self.release}/"
lib/docs/scrapers/typescript.rb+2−2
@@ -4,7 +4,7 @@ module Docs · 3 unmodified lines
4 4
5 self.name = 'TypeScript'5 self.name = 'TypeScript'
6 self.type = 'typescript'6 self.type = 'typescript'
7 self.release = '4.9.3'7 self.release = '5.0.2'
8 self.base_urls = [8 self.base_urls = [
9 'https://www.typescriptlang.org/docs/handbook/',9 'https://www.typescriptlang.org/docs/handbook/',
10 'https://www.typescriptlang.org/'10 'https://www.typescriptlang.org/'
@@ -35,7 +35,7 @@ module Docs · 24 unmodified lines
35 ]35 ]
36 36
37 options[:attribution] = <<-HTML37 options[:attribution] = <<-HTML
38 &copy; 2012-2022 Microsoft<br>38 &copy; 2012-2023 Microsoft<br>
39 Licensed under the Apache License, Version 2.0.39 Licensed under the Apache License, Version 2.0.
40 HTML40 HTML
41 41
lib/docs/scrapers/vitest.rb+1−1
@@ -16,7 +16,7 @@ module Docs · 15 unmodified lines
16 Licensed under the MIT License.16 Licensed under the MIT License.
17 HTML17 HTML
18 18
19 self.release = '0.27.1'19 self.release = '0.30.1'
20 self.base_url = 'https://vitest.dev/'20 self.base_url = 'https://vitest.dev/'
21 self.initial_paths = %w(guide/)21 self.initial_paths = %w(guide/)
22 html_filters.push 'vitest/entries', 'vite/clean_html'22 html_filters.push 'vitest/entries', 'vite/clean_html'