Skip to content

Commit 7cc36c5

Browse files
committed
Merge branch 'master' into production
2 parents 5b97d3f + 3878815 commit 7cc36c5

40 files changed

+638
-385
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Please select the desired item checkbox and change it to "[x]", then delete opti
2222
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
2323
-->
2424

25-
- [ ] I have run `bash ./tools/deploy.sh --dry-run` (at the root of the project) locally and passed
25+
- [ ] I have run `bash ./tools/test.sh` (at the root of the project) locally and passed
2626
- [ ] I have tested this feature in the browser
2727

2828
### Test Configuration

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,22 @@ on:
2020
jobs:
2121
build:
2222
runs-on: ubuntu-latest
23+
2324
strategy:
2425
matrix:
2526
ruby: [2.5, 2.6, 2.7, 3]
27+
2628
steps:
2729
- name: Checkout
28-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
2931
with:
3032
fetch-depth: 0 # for posts's lastmod
33+
3134
- name: Setup Ruby
3235
uses: ruby/setup-ruby@v1
3336
with:
3437
ruby-version: ${{ matrix.ruby }}
3538
bundler-cache: true
39+
3640
- name: Test Site
37-
run: bash tools/deploy.sh --dry-run
41+
run: bash tools/test.sh
Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,72 @@
1-
name: 'Automatic build'
1+
name: "Build and deploy"
22
on:
33
push:
44
branches:
5+
- main
56
- master
67
paths-ignore:
78
- .gitignore
89
- README.md
910
- LICENSE
11+
12+
# Allows you to run this workflow manually from the Actions tab
13+
workflow_dispatch:
1014

11-
jobs:
12-
continuous-delivery:
15+
permissions:
16+
contents: read
17+
pages: write
18+
id-token: write
19+
20+
# Allow one concurrent deployment
21+
concurrency:
22+
group: "pages"
23+
cancel-in-progress: true
1324

25+
jobs:
26+
build:
1427
runs-on: ubuntu-latest
1528

1629
steps:
1730
- name: Checkout
18-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
1932
with:
20-
fetch-depth: 0 # for posts's lastmod
33+
fetch-depth: 0
34+
# submodules: true
35+
# If using the 'assets' git submodule from Chirpy Starter, uncomment above
36+
# (See: https://github.com/cotes2020/chirpy-starter/tree/main/assets)
37+
38+
- name: Setup Pages
39+
id: pages
40+
uses: actions/configure-pages@v1
2141

2242
- name: Setup Ruby
2343
uses: ruby/setup-ruby@v1
2444
with:
25-
ruby-version: 2.7
45+
ruby-version: 3 # reads from a '.ruby-version' or '.tools-version' file if 'ruby-version' is omitted
2646
bundler-cache: true
2747

28-
- name: Deploy
29-
run: bash tools/deploy.sh
48+
- name: Build site
49+
run: bundle exec jekyll b -d "_site${{ steps.pages.outputs.base_path }}"
50+
env:
51+
JEKYLL_ENV: "production"
52+
53+
- name: Test site
54+
run: |
55+
bundle exec htmlproofer _site --disable-external --check-html --allow_hash_href
56+
57+
- name: Upload site artifact
58+
uses: actions/upload-pages-artifact@v1
59+
with:
60+
path: "_site${{ steps.pages.outputs.base_path }}"
61+
62+
deploy:
63+
name: "Deploy site"
64+
environment:
65+
name: github-pages
66+
url: ${{ steps.deployment.outputs.page_url }}
67+
runs-on: ubuntu-latest
68+
needs: build
69+
steps:
70+
- name: Deploy to GitHub Pages
71+
id: deployment
72+
uses: actions/deploy-pages@v1

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [5.3.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v5.2.1...v5.3.0) (2022-09-23)
6+
7+
8+
### Features
9+
10+
* add multiple authors to a post ([#677](https://github.com/cotes2020/jekyll-theme-chirpy/issues/677)) ([f1d9e99](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f1d9e99bc02d3cd0a6b0cd1beac545f0cc7a24f8)), closes [#675](https://github.com/cotes2020/jekyll-theme-chirpy/issues/675)
11+
* **i18n:** add Bulgarian support ([#612](https://github.com/cotes2020/jekyll-theme-chirpy/issues/612)) ([2fed338](https://github.com/cotes2020/jekyll-theme-chirpy/commit/2fed338ce6d078bf528c9717201fbc475f88cd22))
12+
* **i18n:** add German locale file ([#663](https://github.com/cotes2020/jekyll-theme-chirpy/issues/663)) ([940b281](https://github.com/cotes2020/jekyll-theme-chirpy/commit/940b2810e95065e30600ae8d5e4612e7183da60e))
13+
* **i18n:** add Hungarian locale file ([#597](https://github.com/cotes2020/jekyll-theme-chirpy/issues/597), [#598](https://github.com/cotes2020/jekyll-theme-chirpy/issues/598)) ([b032977](https://github.com/cotes2020/jekyll-theme-chirpy/commit/b0329775fc24d0323e5cc04cda46ece8b4531802))
14+
* **i18n:** add Turkish language ([#631](https://github.com/cotes2020/jekyll-theme-chirpy/issues/631)) ([ad137fa](https://github.com/cotes2020/jekyll-theme-chirpy/commit/ad137fa2945b1870b9c1dd5e9212a5f4af7c3580))
15+
16+
17+
### Bug Fixes
18+
19+
* add missing color to linkedin icon for share list ([#683](https://github.com/cotes2020/jekyll-theme-chirpy/issues/683)) ([0dcd39d](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0dcd39d491c9c49e4acf7f75f83fe6e1d1839e37))
20+
* code contains spaces in headings ([#644](https://github.com/cotes2020/jekyll-theme-chirpy/issues/644)) ([3fa1bf3](https://github.com/cotes2020/jekyll-theme-chirpy/commit/3fa1bf305451f645a7f3aa93863b076463c8f165))
21+
* correct spelling of `panel` ([#686](https://github.com/cotes2020/jekyll-theme-chirpy/issues/686)) ([b288587](https://github.com/cotes2020/jekyll-theme-chirpy/commit/b288587c1c3d113a1c52c2d25fb46cddda348961))
22+
* correct the i18n for tab titles ([0c5b697](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0c5b697fd3b283b6a5c926742b61ed49d8688c18))
23+
* the `code` doesn’t wrap inside the prompt ([#626](https://github.com/cotes2020/jekyll-theme-chirpy/issues/626)) ([378b65a](https://github.com/cotes2020/jekyll-theme-chirpy/commit/378b65a0617787813519dde74d6f741f255eff3d))
24+
525
## [5.2.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v5.2.0...v5.2.1) (2022-06-17)
626

727

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ After a while, navigate to the site at <http://localhost:4000>.
7373

7474
## Documentation
7575

76-
For more details on usage, please refer to the tutorial on the [demo website](https://cotes2020.github.io/chirpy-demo/) / [wiki](https://github.com/cotes2020/jekyll-theme-chirpy/wiki). Note that the tutorial is based on the [latest tag](https://github.com/cotes2020/jekyll-theme-chirpy/tags), and the features of the default branch are usually ahead of the documentation.
76+
For more details on usage, please refer to the tutorial on the [demo website](https://cotes2020.github.io/chirpy-demo/) / [wiki](https://github.com/cotes2020/jekyll-theme-chirpy/wiki). Note that the tutorial is based on the [latest release](https://github.com/cotes2020/jekyll-theme-chirpy/releases/latest), and the features of the default branch are usually ahead of the documentation.
7777

7878
## Contributing
7979

_data/locales/bg-BG.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# The layout text of site
2+
3+
# ----- Commons label -----
4+
5+
layout:
6+
post: Публикация
7+
category: Категория
8+
tag: Тагове
9+
10+
# The tabs of sidebar
11+
tabs:
12+
# format: <filename_without_extension>: <value>
13+
home: Начало
14+
categories: Категории
15+
tags: Тагове
16+
archives: Архив
17+
about: За мен
18+
19+
# the text displayed in the search bar & search results
20+
search:
21+
hint: търси
22+
cancel: Отмени
23+
no_results: Упс! Не са намерени резултати.
24+
25+
panel:
26+
lastmod: Наскоро обновени
27+
trending_tags: Популярни тагове
28+
toc: Съдържание
29+
30+
copyright:
31+
# Shown at the bottom of the post
32+
license:
33+
template: Тази публикация е лицензирана под :LICENSE_NAME от автора.
34+
name: CC BY 4.0
35+
link: https://creativecommons.org/licenses/by/4.0/
36+
37+
# Displayed in the footer
38+
brief: Някои права запазени.
39+
verbose: >-
40+
Освен ако не е посочено друго, публикациите в блога на този сайт са лицензирани
41+
под лиценза Creative Commons Attribution 4.0 (CC BY 4.0) от автора.
42+
43+
meta: Създадено чрез :PLATFORM и :THEME тема.
44+
45+
not_found:
46+
statment: Съжалявам, но този на този URL адрес няма налично съдържание.
47+
48+
notification:
49+
update_found: Налична е нова версия на съдържанието.
50+
update: Обнови
51+
52+
# ----- Posts related labels -----
53+
54+
post:
55+
written_by: Автор
56+
posted: Публикувана
57+
updated: Обновена
58+
words: думи
59+
pageview_measure: преглеждания
60+
read_time:
61+
unit: мин
62+
prompt: четиво
63+
relate_posts: Още за четене
64+
share: Споделете
65+
button:
66+
next: По-нови
67+
previous: По-стари
68+
copy_code:
69+
succeed: Копирано!
70+
share_link:
71+
title: Копирай линк
72+
succeed: Линкът е копиран успешно!
73+
# pinned prompt of posts list on homepage
74+
pin_prompt: Прикрепен
75+
76+
# categories page
77+
categories:
78+
category_measure:
79+
singular: категория
80+
plural: категории
81+
post_measure:
82+
singular: публикация
83+
plural: публикации

_data/locales/de-DE.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# The layout text of site
2+
3+
# ----- Commons label -----
4+
5+
layout:
6+
post: Eintrag
7+
category: Kategorie
8+
tag: Tag
9+
10+
# The tabs of sidebar
11+
tabs:
12+
# format: <filename_without_extension>: <value>
13+
home: Startseite
14+
categories: Kategorien
15+
tags: Tags
16+
archives: Archiv
17+
about: Über
18+
19+
# the text displayed in the search bar & search results
20+
search:
21+
hint: Suche
22+
cancel: Abbrechen
23+
no_results: Ups! Keine Einträge gefunden.
24+
25+
panel:
26+
lastmod: Kürzlich aktualisiert
27+
trending_tags: Beliebte Tags
28+
toc: Inhalt
29+
30+
copyright:
31+
# Shown at the bottom of the post
32+
license:
33+
template: Dieser Eintrag ist vom Autor unter :LICENSE_NAME lizensiert.
34+
name: CC BY 4.0
35+
link: https://creativecommons.org/licenses/by/4.0/
36+
37+
# Displayed in the footer
38+
brief: Einige Rechte vorbehalten.
39+
verbose: >-
40+
Alle Einträge auf dieser Seite stehen, soweit nicht anders angegeben, unter der Lizenz Creative Commons Attribution 4.0 (CC BY 4.0).
41+
42+
meta: Powered by :PLATFORM with :THEME theme.
43+
44+
not_found:
45+
statment: Entschuldigung, dieser Link verweist auf keine vorhandene Ressource.
46+
47+
notification:
48+
update_found: Eine neue Version ist verfügbar.
49+
update: Neue Version
50+
51+
# ----- Posts related labels -----
52+
53+
post:
54+
written_by: Von
55+
posted: Veröffentlicht
56+
updated: Aktualisiert
57+
words: Wörter
58+
pageview_measure: Aufrufe
59+
read_time:
60+
unit: Minuten
61+
prompt: lesen
62+
relate_posts: Weiterlesen
63+
share: Teilen
64+
button:
65+
next: Nächster Eintrag
66+
previous: Eintrag vorher
67+
copy_code:
68+
succeed: Kopiert!
69+
share_link:
70+
title: Link kopieren
71+
succeed: Link erfolgreich kopiert!
72+
# pinned prompt of posts list on homepage
73+
pin_prompt: Angepinnt
74+
75+
# categories page
76+
categories:
77+
category_measure:
78+
singular: Kategorie
79+
plural: Kategorien
80+
post_measure:
81+
singular: Eintrag
82+
plural: Einträge

_data/locales/hu-HU.yml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# The layout text of site
2+
3+
# ----- Commons label -----
4+
5+
layout:
6+
post: Bejegyzés
7+
category: Kategória
8+
tag: Címke
9+
10+
# The tabs of sidebar
11+
tabs:
12+
# format: <filename_without_extension>: <value>
13+
home: Kezdőlap
14+
categories: Kategóriák
15+
tags: Címkék
16+
archives: Archívum
17+
about: Rólam
18+
19+
# the text displayed in the search bar & search results
20+
search:
21+
hint: keresés
22+
cancel: Mégse
23+
no_results: Oops! Nincs találat a keresésre.
24+
25+
panel:
26+
lastmod: Legutóbb frissítve
27+
trending_tags: Népszerű Címkék
28+
toc: Tartalom
29+
links: Blog linkek
30+
31+
copyright:
32+
# Shown at the bottom of the post
33+
license:
34+
template: A bejegyzés :LICENSE_NAME licenccel rendelkezik.
35+
name: CC BY 4.0
36+
link: https://creativecommons.org/licenses/by/4.0/
37+
38+
# Displayed in the footer
39+
brief: Néhány jog fenntartva.
40+
verbose: >-
41+
Az oldalon található tartalmak
42+
Creative Commons Attribution 4.0 International (CC BY 4.0) licenccel rendelkeznek,
43+
hacsak másképp nincs jelezve.
44+
45+
meta: Készítve :PLATFORM motorral :THEME témával.
46+
47+
not_found:
48+
statment: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat.
49+
50+
notification:
51+
update_found: Elérhető a tartalom új verziója.
52+
update: Frissítés
53+
54+
# ----- Posts related labels -----
55+
56+
post:
57+
written_by: Szerző
58+
posted: Létrehozva
59+
updated: Frissítve
60+
words: szó
61+
pageview_measure: látogató
62+
read_time:
63+
unit: perc
64+
prompt: elolvasni
65+
relate_posts: További olvasnivaló
66+
share: Megosztás
67+
button:
68+
next: Újabb
69+
previous: Régebbi
70+
copy_code:
71+
succeed: Másolva!
72+
share_link:
73+
title: Link másolása
74+
succeed: Link sikeresen másolva!
75+
# pinned prompt of posts list on homepage
76+
pin_prompt: Kitűzve
77+
78+
# categories page
79+
categories:
80+
category_measure: kategória
81+
post_measure: bejegyzés

0 commit comments

Comments
 (0)