Skip to content

Commit 0556240

Browse files
Merge branch 'master' into ja
2 parents 8bc2c32 + ebf90a5 commit 0556240

35 files changed

+128
-68
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
- [ ] Have you followed the [contributing guidelines](https://github.com/github/opensource.guide/blob/master/CONTRIBUTING.md)?
22
- [ ] Have you explained what your changes do, and why they add value to the Guides?
3-
- [ ] Have you enabled GitHub Pages Previews by pressing <keyboard>`Enable GitHub Pages`</keyboard> on the right sidebar to trigger a pages build for this PR?
43

54
**Please note: we will close your PR without comment if you do not check the boxes above and provide ALL requested information.**
65

.github/main.workflow

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
workflow "Test and build on push" {
2+
resolves = ["Jekyll Pages Builder"]
3+
on = "pull_request"
4+
}
5+
6+
action "CI Test Runner" {
7+
uses = "./.github/test_runner"
8+
secrets = ["GITHUB_TOKEN"]
9+
}
10+
11+
action "Jekyll Pages Builder" {
12+
needs = "CI Test Runner"
13+
uses = "./.github/pages_builder"
14+
secrets = ["GITHUB_TOKEN"]
15+
}

.github/pages_builder/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM jekyll/jekyll
2+
3+
LABEL "com.github.actions.name"="Jekyll Pages Builder"
4+
LABEL "com.github.actions.description"="Build the full jekyll pages site"
5+
LABEL "com.github.actions.icon"="gear"
6+
LABEL "com.github.actions.color"="purple"
7+
8+
ENV LC_ALL C.UTF-8
9+
ENV LANG en_US.UTF-8
10+
ENV LANGUAGE en_US.UTF-8
11+
12+
COPY entrypoint.sh /
13+
14+
ENTRYPOINT ["/entrypoint.sh"]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh -l
2+
3+
script/bootstrap
4+
cd test && npm install && cd ..
5+
JEKYLL_GITHUB_TOKEN=$GITHUB_TOKEN script/build

.github/test_runner/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM jekyll/jekyll
2+
3+
LABEL "com.github.actions.name"="CI Test Runner"
4+
LABEL "com.github.actions.description"="Run the full test suite"
5+
LABEL "com.github.actions.icon"="gear"
6+
LABEL "com.github.actions.color"="purple"
7+
8+
ENV LC_ALL C.UTF-8
9+
ENV LANG en_US.UTF-8
10+
ENV LANGUAGE en_US.UTF-8
11+
12+
COPY entrypoint.sh /
13+
14+
ENTRYPOINT ["/entrypoint.sh"]

.github/test_runner/entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh -l
2+
3+
script/bootstrap
4+
cd test && npm install && cd ..
5+
JEKYLL_GITHUB_TOKEN=$GITHUB_TOKEN script/test

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
sudo: false
21
language: node_js
32
node_js:
43
- 6

Gemfile.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.10)
4+
activesupport (4.2.11.1)
55
i18n (~> 0.7)
66
minitest (~> 5.1)
77
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9-
addressable (2.5.2)
9+
addressable (2.6.0)
1010
public_suffix (>= 2.0.2, < 4.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source
@@ -16,7 +16,7 @@ GEM
1616
colorize (0.8.1)
1717
commonmarker (0.17.13)
1818
ruby-enum (~> 0.5)
19-
concurrent-ruby (1.1.4)
19+
concurrent-ruby (1.1.5)
2020
dnsruby (1.61.2)
2121
addressable (~> 2.5)
2222
em-websocket (0.5.1)
@@ -30,11 +30,11 @@ GEM
3030
multipart-post (>= 1.2, < 3)
3131
ffi (1.10.0)
3232
forwardable-extended (2.6.0)
33-
gemoji (3.0.0)
34-
github-pages (196)
35-
activesupport (= 4.2.10)
36-
github-pages-health-check (= 1.16.0)
37-
jekyll (= 3.7.4)
33+
gemoji (3.0.1)
34+
github-pages (198)
35+
activesupport (= 4.2.11.1)
36+
github-pages-health-check (= 1.16.1)
37+
jekyll (= 3.8.5)
3838
jekyll-avatar (= 0.6.0)
3939
jekyll-coffeescript (= 1.1.1)
4040
jekyll-commonmark-ghpages (= 0.1.5)
@@ -76,13 +76,13 @@ GEM
7676
nokogiri (>= 1.8.5, < 2.0)
7777
rouge (= 2.2.1)
7878
terminal-table (~> 1.4)
79-
github-pages-health-check (1.16.0)
79+
github-pages-health-check (1.16.1)
8080
addressable (~> 2.3)
8181
dnsruby (~> 1.60)
8282
octokit (~> 4.0)
8383
public_suffix (~> 3.0)
8484
typhoeus (~> 1.3)
85-
html-pipeline (2.10.0)
85+
html-pipeline (2.11.0)
8686
activesupport (>= 2)
8787
nokogiri (>= 1.4)
8888
html-proofer (3.10.2)
@@ -97,7 +97,7 @@ GEM
9797
http_parser.rb (0.6.0)
9898
i18n (0.9.5)
9999
concurrent-ruby (~> 1.0)
100-
jekyll (3.7.4)
100+
jekyll (3.8.5)
101101
addressable (~> 2.4)
102102
colorator (~> 1.0)
103103
em-websocket (~> 0.5)
@@ -115,9 +115,9 @@ GEM
115115
jekyll-coffeescript (1.1.1)
116116
coffee-script (~> 2.2)
117117
coffee-script-source (~> 1.11.1)
118-
jekyll-commonmark (1.2.0)
118+
jekyll-commonmark (1.3.1)
119119
commonmarker (~> 0.14)
120-
jekyll (>= 3.0, < 4.0)
120+
jekyll (>= 3.7, < 5.0)
121121
jekyll-commonmark-ghpages (0.1.5)
122122
commonmarker (~> 0.17.6)
123123
jekyll-commonmark (~> 1)
@@ -195,7 +195,7 @@ GEM
195195
jekyll-seo-tag (~> 2.0)
196196
jekyll-titles-from-headings (0.5.1)
197197
jekyll (~> 3.3)
198-
jekyll-watch (2.1.2)
198+
jekyll-watch (2.2.1)
199199
listen (~> 3.0)
200200
jemoji (0.10.2)
201201
gemoji (~> 3.0)
@@ -215,11 +215,11 @@ GEM
215215
jekyll-seo-tag (~> 2.1)
216216
minitest (5.11.3)
217217
multipart-post (2.0.0)
218-
nokogiri (1.10.1)
218+
nokogiri (1.10.3)
219219
mini_portile2 (~> 2.4.0)
220-
octokit (4.13.0)
220+
octokit (4.14.0)
221221
sawyer (~> 0.8.0, >= 0.5.3)
222-
parallel (1.14.0)
222+
parallel (1.17.0)
223223
pathutil (0.16.2)
224224
forwardable-extended (~> 2.6)
225225
public_suffix (3.0.3)
@@ -233,23 +233,23 @@ GEM
233233
ruby_dep (1.5.0)
234234
rubyzip (1.2.2)
235235
safe_yaml (1.0.5)
236-
sass (3.7.3)
236+
sass (3.7.4)
237237
sass-listen (~> 4.0.0)
238238
sass-listen (4.0.0)
239239
rb-fsevent (~> 0.9, >= 0.9.4)
240240
rb-inotify (~> 0.9, >= 0.9.7)
241-
sawyer (0.8.1)
242-
addressable (>= 2.3.5, < 2.6)
243-
faraday (~> 0.8, < 1.0)
241+
sawyer (0.8.2)
242+
addressable (>= 2.3.5)
243+
faraday (> 0.8, < 2.0)
244244
terminal-table (1.8.0)
245245
unicode-display_width (~> 1.1, >= 1.1.1)
246246
thread_safe (0.3.6)
247247
typhoeus (1.3.1)
248248
ethon (>= 0.9.0)
249249
tzinfo (1.2.5)
250250
thread_safe (~> 0.1)
251-
unicode-display_width (1.4.1)
252-
yell (2.0.7)
251+
unicode-display_width (1.5.0)
252+
yell (2.1.0)
253253

254254
PLATFORMS
255255
ruby

_articles/building-community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ In your CONTRIBUTING file, explicitly tell new contributors how to get started.
136136

137137
![Django new contributors page](/assets/images/building-community/django_new_contributors.png)
138138

139-
In your issue queue, label bugs that are suitable for different types of contributors: for example, [_"first timers only"_](https://medium.com/@kentcdodds/first-timers-only-78281ea47455), _"good first issue"_, or _"documentation"_. [These labels](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) make it easy for someone new to your project to quickly scan your issues and get started.
139+
In your issue queue, label bugs that are suitable for different types of contributors: for example, [_"first timers only"_](https://kentcdodds.com/blog/first-timers-only), _"good first issue"_, or _"documentation"_. [These labels](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) make it easy for someone new to your project to quickly scan your issues and get started.
140140

141141
Finally, use your documentation to make people feel welcome at every step of the way.
142142

_articles/de/building-community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Geben Sie in Ihrer CONTRIBUTING-Datei explizit an, wie sie anfangen sollen. Viel
146146

147147
![Djangos Startseite für neue Mitwirkende](/assets/images/building-community/django_new_contributors.png)
148148

149-
Die Liste der Issues sollte durchsortiert sein, Bugs z.B. als solche markiert, sowie Issues auch für unterschiedliche potentielle Kontributor\*innen: z.B. [_"first timers only"_](https://medium.com/@kentcdodds/first-timers-only-78281ea47455), _"good first issue"_, oder _"documentation"_. [Solche "Labels"](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) vereinfachen es Neuankömmlingen, sich in Ihrem Projekt zurechtzufinden und mit der Lösung eines Problems zu beginnen.
149+
Die Liste der Issues sollte durchsortiert sein, Bugs z.B. als solche markiert, sowie Issues auch für unterschiedliche potentielle Kontributor\*innen: z.B. [_"first timers only"_](https://kentcdodds.com/blog/first-timers-only), _"good first issue"_, oder _"documentation"_. [Solche "Labels"](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) vereinfachen es Neuankömmlingen, sich in Ihrem Projekt zurechtzufinden und mit der Lösung eines Problems zu beginnen.
150150

151151
Nicht zuletzt sollten Sie die Dokumentation nutzen, um Leute mit offenen Armen zu empfangen und ihnen Schritt-für-Schritt zu helfen.
152152

0 commit comments

Comments
 (0)