Merge branch 'hotfix/4.3.2'

This commit is contained in:
Cotes Chung 2021-10-15 00:49:57 +08:00
commit 421db9dc92
15 changed files with 29 additions and 16 deletions

View file

@ -3,7 +3,9 @@ dist: bionic
language: minimal
if: tag =~ /^v(\d)+(\.(\d)+){2}$/
branches:
only:
- /^release\/(\d)+(\.(\d)+){1}$/
jobs:
include:

View file

@ -5,7 +5,7 @@
{% capture result_elem %}
<div class="pl-1 pr-1 pl-sm-2 pr-sm-2 pl-lg-4 pr-lg-4 pl-xl-0 pr-xl-0">
<a href="{{ site.url }}{url}">{title}</a>
<a href="{url}">{title}</a>
<div class="post-meta d-flex flex-column flex-sm-row text-muted mt-1 mb-1">
{categories}
{tags}

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -1,7 +1,7 @@
/*!
* The styles for Jekyll theme Chirpy
*
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -6,7 +6,7 @@ layout: compress
{% for post in site.posts %}
{
"title": "{{ post.title | escape }}",
"url": "{{ site.baseurl }}{{ post.url }}",
"url": "{{ post.url | relative_url }}",
"categories": "{{ post.categories | join: ', '}}",
"tags": "{{ post.tags | join: ', ' }}",
"date": "{{ post.date }}",

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -1,5 +1,5 @@
/*!
* Chirpy v4.3.1 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* Chirpy v4.3.2 (https://github.com/cotes2020/jekyll-theme-chirpy/)
* © 2019 Cotes Chung
* MIT Licensed
*/

View file

@ -2,7 +2,7 @@
Gem::Specification.new do |spec|
spec.name = "jekyll-theme-chirpy"
spec.version = "4.3.1"
spec.version = "4.3.2"
spec.authors = ["Cotes Chung"]
spec.email = ["cotes.chung@gmail.com"]

View file

@ -1,6 +1,6 @@
{
"name": "jekyll-theme-chirpy",
"version": "4.3.1",
"version": "4.3.2",
"description": "A minimal, sidebar, responsive web design Jekyll theme that focuses on text presentation.",
"main": "index.js",
"directories": {

View file

@ -69,7 +69,7 @@ init_files() {
rm -f "$_workflow.$TEMP_SUFFIX"
## Cleanup image settings in site config
sed -i.$TEMP_SUFFIX "s/^img_cdn:.*/img_cdn: ''/;s/^avatar:.*/avatar: ''/" _config.yml
sed -i.$TEMP_SUFFIX "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml
rm -f _config.yml.$TEMP_SUFFIX
fi
@ -83,7 +83,7 @@ init_files() {
rm -rf _posts/* docs
# save changes
git add -A && git add .github -f
git add -A
git commit -m "[Automation] Initialize the environment." -q
echo "[INFO] Initialization successful!"

View file

@ -28,6 +28,16 @@ check() {
fi
}
## Remove unnecessary theme settings
cleanup_config() {
cp _config.yml _config.yml.bak
sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml
}
resume_config() {
mv _config.yml.bak _config.yml
}
release() {
_default_branch="$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')"
_version="$(grep "spec.version" jekyll-theme-chirpy.gemspec | sed 's/.*= "//;s/".*//')" # X.Y.Z
@ -49,9 +59,10 @@ release() {
# build a gem package
echo -e "Build the gem pakcage for v$_version\n"
cleanup_config
rm -f ./*.gem
gem build "$GEM_SPEC"
resume_config
}
main() {