Skip to content

Commit 2654b8d

Browse files
authored
Merge branch 'master' into master
2 parents 37b5c1b + 5d0b442 commit 2654b8d

File tree

13 files changed

+70
-41
lines changed

13 files changed

+70
-41
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
workflow "test" {
2+
resolves = ["CI Test Runner"]
3+
on = "push"
4+
}
5+
6+
action "CI Test Runner" {
7+
uses = "./.github/test_runner"
8+
secrets = ["GITHUB_TOKEN"]
9+
}
10+
11+
workflow "build" {
12+
on = "push"
13+
resolves = ["Jekyll Pages Builder"]
14+
}
15+
16+
action "Jekyll Pages Builder" {
17+
uses = "./.github/pages_builder"
18+
secrets = ["GITHUB_TOKEN"]
19+
}

.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 & 28 deletions
This file was deleted.

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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)
@@ -31,10 +31,10 @@ GEM
3131
ffi (1.10.0)
3232
forwardable-extended (2.6.0)
3333
gemoji (3.0.0)
34-
github-pages (197)
35-
activesupport (= 4.2.10)
34+
github-pages (198)
35+
activesupport (= 4.2.11.1)
3636
github-pages-health-check (= 1.16.1)
37-
jekyll (= 3.7.4)
37+
jekyll (= 3.8.5)
3838
jekyll-avatar (= 0.6.0)
3939
jekyll-coffeescript (= 1.1.1)
4040
jekyll-commonmark-ghpages (= 0.1.5)
@@ -82,7 +82,7 @@ GEM
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)
@@ -215,7 +215,7 @@ GEM
215215
jekyll-seo-tag (~> 2.1)
216216
minitest (5.11.3)
217217
multipart-post (2.0.0)
218-
nokogiri (1.10.2)
218+
nokogiri (1.10.3)
219219
mini_portile2 (~> 2.4.0)
220220
octokit (4.14.0)
221221
sawyer (~> 0.8.0, >= 0.5.3)

_articles/de/starting-a-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Sie können Ihre README verwenden, um andere Fragen zu beantworten: z.B. wie Sie
175175

176176
Manchmal vermeiden es Leute, eine README zu schreiben, weil sie das Gefühl haben, das Projekt sei unvollendet, oder weil sie keine Beiträge wollen. Aber auch dies sind gute Gründe, eine zu schreiben.
177177

178-
Weitere Inspirationen zum Schreiben einer README finden Sie in @18F's ["Making READMEs Readable"](https://pages.18f.gov/open-source-guide/making-readmes-readable/) oder in @PurpleBooth's [README template](https://gist.github.com/PurpleBooth/109311bb0361f32d87a2).
178+
Weitere Inspirationen zum Schreiben einer README finden Sie in @dguo's ["Make a README"-Anleitung](https://www.makeareadme.com/) oder in @PurpleBooth's [README-Vorlage](https://gist.github.com/PurpleBooth/109311bb0361f32d87a2).
179179

180180
Wenn Sie eine README-Datei im Hauptordner Ihres Projektes anlegen, zeigt GitHub diese automatisch auf der Homepage des Repos an.
181181

_articles/starting-a-project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ You can use your README to answer other questions, like how you handle contribut
165165

166166
Sometimes, people avoid writing a README because they feel like the project is unfinished, or they don't want contributions. These are all very good reasons to write one.
167167

168-
For more inspiration, try using @18F's ["Making READMEs Readable"](https://pages.18f.gov/open-source-guide/making-readmes-readable/) or @PurpleBooth's [README template](https://gist.github.com/PurpleBooth/109311bb0361f32d87a2) to write a complete README.
168+
For more inspiration, try using @dguo's ["Make a README" guide](https://www.makeareadme.com/) or @PurpleBooth's [README template](https://gist.github.com/PurpleBooth/109311bb0361f32d87a2) to write a complete README.
169169

170170
When you include a README file in the root directory, GitHub will automatically display it on the repository homepage.
171171

0 commit comments

Comments
 (0)