Skip to content

Commit 98793cc

Browse files
authored
Merge branch 'master' into patch-1
2 parents 550a98e + a7f2c7a commit 98793cc

File tree

9 files changed

+61
-4
lines changed

9 files changed

+61
-4
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

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)

script/html-proofer

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ require "html-proofer"
55

66
url_ignores = [
77
"https://okdistribute.xyz/post/okf-de",
8-
"https://www.drupal.org/community-initiatives/drupal-core/usability"
8+
"https://www.drupal.org/community-initiatives/drupal-core/usability",
9+
"https://scripts.sil.org/ofl",
910
]
1011

1112
HTMLProofer::Runner.new(

test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"async": "^2.0.0",
55
"dictionary-en-us": "^2.0.0",
66
"download": "^5.0.3",
7-
"ebrew": "^0.1.1",
7+
"ebrew": "^0.2.3",
88
"fastmatter": "^1.1.1",
99
"glob": "^7.0.5",
1010
"ignore": "^3.1.3",

0 commit comments

Comments
 (0)