Skip to content

Commit cd54418

Browse files
authored
Merge branch 'main' into main
2 parents 947004e + 649ecfc commit cd54418

File tree

147 files changed

+965
-457
lines changed

Some content is hidden

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

147 files changed

+965
-457
lines changed

.gitattributes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Example of a `.gitattributes` file which reclassifies `.rb` files as Java:
2+
#
3+
# *.rb linguist-language=Java
4+
#
5+
# See: https://github.com/github-linguist/linguist/blob/master/docs/overrides.md
6+
7+
# Mark Jekyll-based markups as Ruby
8+
docs/** -linguist-documentation
9+
docs/_includes/* linguist-language=Ruby
10+
docs/_layouts/* linguist-language=Ruby
11+
docs/_sass/** linguist-language=Ruby

.github/workflows/ci.yml

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
name: Test & Deploy
22
on:
33
push:
4-
branches: [ main ]
4+
branches:
5+
- main
6+
pull_request:
7+
branches:
8+
- "*"
9+
# Allows you to run this workflow manually from the Actions tab
10+
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
11+
workflow_dispatch:
512

613
jobs:
714
test:
@@ -10,7 +17,7 @@ jobs:
1017
steps:
1118

1219
- name: ☑️ Checkout code
13-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
1421
with:
1522
fetch-depth: 2
1623

@@ -23,42 +30,22 @@ jobs:
2330
- name: 🧪 Install gems
2431
run: |
2532
cd ./docs
26-
bundle config set path 'vendor/bundle'
27-
bundle install --jobs 4 --retry 3
33+
bundle install
2834
2935
- name: 🔧 Build & Test
3036
run: |
3137
cd ./docs
3238
JEKYLL_ENV=production bundle exec jekyll build
33-
bundle exec rake upsert_data_by_readme:all
39+
bundle exec rake upsert_data_by_readme
3440
bundle exec rake test
3541
36-
- name: 🔔 Notify results
37-
env:
38-
IDOBATA_GITHUB_ACTIONS: ${{ secrets.IDOBATA_GITHUB_ACTIONS }}
39-
uses: yasslab/idobata_notify@main
40-
if: always() && (env.IDOBATA_GITHUB_ACTIONS != null)
41-
with:
42-
idobata_hook_url: ${{ env.IDOBATA_GITHUB_ACTIONS }}
43-
44-
deploy:
45-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
46-
needs: test
47-
runs-on: ubuntu-latest
48-
steps:
49-
- name: ☑️ Checkout code
50-
uses: actions/checkout@v2
51-
with:
52-
fetch-depth: 1
53-
5442
- name: 🚀 Deploy
55-
if: github.ref == 'refs/heads/main' && job.status == 'success'
43+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
5644
run: |
5745
cd ./docs
5846
if [ -n "$(git status en ja --porcelain)" ]; then
59-
git config user.name "Yohei Yasukawa"
60-
git config user.email "[email protected]"
61-
git remote set-url origin https://github-actions:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
47+
git config --global user.name "Yohei Yasukawa"
48+
git config --global user.email "[email protected]"
6249
git checkout main
6350
git add en ja
6451
git commit -m '🤖 Generate page(s) by README'

README.en.md

Lines changed: 50 additions & 33 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 64 additions & 38 deletions
Large diffs are not rendered by default.

docs/.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.3.0

docs/Gemfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ source 'http://rubygems.org'
22

33
gem 'rake'
44
gem 'sanitize'
5-
gem "liquid-c"
5+
6+
# Declare to install bundled gems to fix warnings:
7+
# https://www.ruby-lang.org/ja/news/2023/12/25/ruby-3-3-0-released/
8+
gem 'csv'
9+
gem 'base64'
10+
gem 'bigdecimal'
611

712
group :development, :test do
8-
gem 'pry'
913
gem 'html-proofer'
1014
end
1115

docs/Gemfile.lock

Lines changed: 84 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,152 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
addressable (2.8.0)
5-
public_suffix (>= 2.0.2, < 5.0)
6-
coderay (1.1.3)
4+
Ascii85 (1.1.0)
5+
addressable (2.8.6)
6+
public_suffix (>= 2.0.2, < 6.0)
7+
afm (0.2.2)
8+
async (2.8.1)
9+
console (~> 1.10)
10+
fiber-annotation
11+
io-event (~> 1.1)
12+
timers (~> 4.1)
13+
base64 (0.2.0)
14+
bigdecimal (3.1.6)
715
colorator (1.1.0)
8-
concurrent-ruby (1.1.8)
16+
concurrent-ruby (1.2.3)
17+
console (1.23.3)
18+
fiber-annotation
19+
fiber-local
920
crass (1.0.6)
10-
em-websocket (0.5.2)
21+
csv (3.2.8)
22+
em-websocket (0.5.3)
1123
eventmachine (>= 0.12.9)
12-
http_parser.rb (~> 0.6.0)
13-
ethon (0.12.0)
14-
ffi (>= 1.3.0)
24+
http_parser.rb (~> 0)
25+
ethon (0.16.0)
26+
ffi (>= 1.15.0)
1527
eventmachine (1.2.7)
16-
eventmachine (1.2.7-x86-mingw32)
17-
ffi (1.15.0)
18-
ffi (1.15.0-x86-mingw32)
28+
ffi (1.16.3)
29+
fiber-annotation (0.2.0)
30+
fiber-local (1.0.0)
1931
forwardable-extended (2.6.0)
20-
html-proofer (3.18.8)
32+
google-protobuf (3.25.2)
33+
hashery (2.1.2)
34+
html-proofer (5.0.8)
2135
addressable (~> 2.3)
22-
mercenary (~> 0.3)
23-
nokogumbo (~> 2.0)
24-
parallel (~> 1.3)
36+
async (~> 2.1)
37+
nokogiri (~> 1.13)
38+
pdf-reader (~> 2.11)
2539
rainbow (~> 3.0)
2640
typhoeus (~> 1.3)
2741
yell (~> 2.0)
28-
http_parser.rb (0.6.0)
29-
i18n (1.8.9)
42+
zeitwerk (~> 2.5)
43+
http_parser.rb (0.8.0)
44+
i18n (1.14.1)
3045
concurrent-ruby (~> 1.0)
31-
jekyll (4.2.0)
46+
io-event (1.4.3)
47+
jekyll (4.3.3)
3248
addressable (~> 2.4)
3349
colorator (~> 1.0)
3450
em-websocket (~> 0.5)
3551
i18n (~> 1.0)
36-
jekyll-sass-converter (~> 2.0)
52+
jekyll-sass-converter (>= 2.0, < 4.0)
3753
jekyll-watch (~> 2.0)
38-
kramdown (~> 2.3)
54+
kramdown (~> 2.3, >= 2.3.1)
3955
kramdown-parser-gfm (~> 1.0)
4056
liquid (~> 4.0)
41-
mercenary (~> 0.4.0)
57+
mercenary (>= 0.3.6, < 0.5)
4258
pathutil (~> 0.9)
43-
rouge (~> 3.0)
59+
rouge (>= 3.0, < 5.0)
4460
safe_yaml (~> 1.0)
45-
terminal-table (~> 2.0)
61+
terminal-table (>= 1.8, < 4.0)
62+
webrick (~> 1.7)
4663
jekyll-include-cache (0.2.1)
4764
jekyll (>= 3.7, < 5.0)
4865
jekyll-paginate (1.1.0)
49-
jekyll-sass-converter (2.1.0)
50-
sassc (> 2.0.1, < 3.0)
51-
jekyll-seo-tag (2.7.1)
66+
jekyll-sass-converter (3.0.0)
67+
sass-embedded (~> 1.54)
68+
jekyll-seo-tag (2.8.0)
5269
jekyll (>= 3.8, < 5.0)
5370
jekyll-sitemap (1.4.0)
5471
jekyll (>= 3.7, < 5.0)
5572
jekyll-watch (2.2.1)
5673
listen (~> 3.0)
57-
kramdown (2.3.1)
74+
kramdown (2.4.0)
5875
rexml
5976
kramdown-parser-gfm (1.1.0)
6077
kramdown (~> 2.0)
61-
liquid (4.0.3)
62-
liquid-c (4.0.0)
63-
liquid (>= 3.0.0)
64-
listen (3.5.0)
78+
liquid (4.0.4)
79+
listen (3.8.0)
6580
rb-fsevent (~> 0.10, >= 0.10.3)
6681
rb-inotify (~> 0.9, >= 0.9.10)
6782
mercenary (0.4.0)
68-
method_source (1.0.0)
69-
mini_portile2 (2.6.1)
70-
nokogiri (1.12.5)
71-
mini_portile2 (~> 2.6.1)
83+
nokogiri (1.16.5-arm64-darwin)
7284
racc (~> 1.4)
73-
nokogiri (1.12.5-x86-mingw32)
85+
nokogiri (1.16.5-x86_64-linux)
7486
racc (~> 1.4)
75-
nokogumbo (2.0.5)
76-
nokogiri (~> 1.8, >= 1.8.4)
77-
parallel (1.20.1)
7887
pathutil (0.16.2)
7988
forwardable-extended (~> 2.6)
80-
pry (0.14.0)
81-
coderay (~> 1.1)
82-
method_source (~> 1.0)
83-
public_suffix (4.0.6)
84-
racc (1.5.2)
85-
rainbow (3.0.0)
86-
rake (13.0.3)
87-
rb-fsevent (0.10.4)
89+
pdf-reader (2.12.0)
90+
Ascii85 (~> 1.0)
91+
afm (~> 0.2.1)
92+
hashery (~> 2.0)
93+
ruby-rc4
94+
ttfunk
95+
public_suffix (5.0.4)
96+
racc (1.7.3)
97+
rainbow (3.1.1)
98+
rake (13.1.0)
99+
rb-fsevent (0.11.2)
88100
rb-inotify (0.10.1)
89101
ffi (~> 1.0)
90-
rexml (3.2.5)
91-
rouge (3.26.0)
102+
rexml (3.2.8)
103+
strscan (>= 3.0.9)
104+
rouge (4.2.0)
105+
ruby-rc4 (0.1.5)
92106
safe_yaml (1.0.5)
93-
sanitize (5.2.3)
107+
sanitize (6.1.0)
94108
crass (~> 1.0.2)
95-
nokogiri (>= 1.8.0)
96-
nokogumbo (~> 2.0)
109+
nokogiri (>= 1.12.0)
97110
sass (3.7.4)
98111
sass-listen (~> 4.0.0)
112+
sass-embedded (1.70.0-arm64-darwin)
113+
google-protobuf (~> 3.25)
114+
sass-embedded (1.70.0-x86_64-linux-gnu)
115+
google-protobuf (~> 3.25)
99116
sass-listen (4.0.0)
100117
rb-fsevent (~> 0.9, >= 0.9.4)
101118
rb-inotify (~> 0.9, >= 0.9.7)
102-
sassc (2.4.0)
103-
ffi (~> 1.9)
119+
strscan (3.1.0)
104120
support-for (1.0.7)
105121
sass (~> 3.3)
106-
terminal-table (2.0.0)
107-
unicode-display_width (~> 1.1, >= 1.1.1)
108-
typhoeus (1.4.0)
122+
terminal-table (3.0.2)
123+
unicode-display_width (>= 1.1.1, < 3)
124+
timers (4.3.5)
125+
ttfunk (1.7.0)
126+
typhoeus (1.4.1)
109127
ethon (>= 0.9.0)
110-
unicode-display_width (1.7.0)
128+
unicode-display_width (2.5.0)
129+
webrick (1.8.1)
111130
yell (2.2.2)
131+
zeitwerk (2.6.13)
112132

113133
PLATFORMS
114-
ruby
115-
x86-mingw32
134+
arm64-darwin-21
135+
x86_64-linux
116136

117137
DEPENDENCIES
138+
base64
139+
bigdecimal
140+
csv
118141
html-proofer
119142
jekyll
120143
jekyll-include-cache
121144
jekyll-paginate
122145
jekyll-seo-tag
123146
jekyll-sitemap
124-
liquid-c
125-
pry
126147
rake
127148
sanitize
128149
support-for
129150

130151
BUNDLED WITH
131-
2.1.4
152+
2.5.6

docs/Rakefile

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
task default: 'test'
22

3+
desc 'Upsert company data from English/Japanese README'
4+
task :upsert_data_by_readme do
5+
ruby "upsert_data_by_readme.rb en"
6+
ruby "upsert_data_by_readme.rb ja"
7+
end
8+
39
namespace :upsert_data_by_readme do
410
desc 'Upsert company data from English README'
511
task :en do
@@ -10,12 +16,6 @@ namespace :upsert_data_by_readme do
1016
task :ja do
1117
ruby "upsert_data_by_readme.rb ja"
1218
end
13-
14-
desc 'Upsert company data for both languages'
15-
task :all do
16-
ruby "upsert_data_by_readme.rb en"
17-
ruby "upsert_data_by_readme.rb ja"
18-
end
1919
end
2020

2121
require 'html-proofer'
@@ -25,21 +25,23 @@ require 'html-proofer'
2525
task test: [:build] do
2626
options = {
2727
allow_hash_href: true,
28-
assume_extension: true,
29-
check_opengraph: true,
30-
check_favicon: true,
31-
check_html: true,
3228
disable_external: true,
29+
checks: ['Links', 'Images', 'OpenGraph', 'Favicon'],
3330

3431
# NOTE: You can ignore file, URL, and response as follows
35-
file_ignore: [
36-
'./_site/google3a4de0d83c05ed13.html',
32+
ignore_files: [
33+
'_site/google3a4de0d83c05ed13.html',
34+
],
35+
ignore_urls: [
36+
%r{^http://www.ahunrupar.co},
37+
%r{^http://kanamei.co.jp},
38+
%r{^http://www.unicon-ltd.com},
39+
%r{^/ja/グロース},
3740
],
38-
#url_ignore: %w(example.com),
39-
#http_status_ignore: [0, 500, 999],
41+
#ignore_status_ignore: [0, 500, 999],
4042
}
4143

42-
HTMLProofer.check_directory('./_site', options).run
44+
HTMLProofer.check_directory('_site/', options).run
4345
end
4446

4547
# Enable 'build' to flush cache files via 'clean'

0 commit comments

Comments
 (0)