diff --git a/.travis.yml b/.travis.yml index 3b674a9..4ad238d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,9 @@ dist: bionic language: minimal -if: tag =~ /^v(\d)+(\.(\d)+){2}$/ +branches: + only: + - /^release\/(\d)+(\.(\d)+){1}$/ jobs: include: diff --git a/_includes/search-loader.html b/_includes/search-loader.html index 9d0a285..d07b63c 100644 --- a/_includes/search-loader.html +++ b/_includes/search-loader.html @@ -5,7 +5,7 @@ {% capture result_elem %}
- {title} + {title}
{categories} {tags} diff --git a/_javascript/copyright b/_javascript/copyright index 3cd7337..8d13efe 100644 --- a/_javascript/copyright +++ b/_javascript/copyright @@ -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 */ diff --git a/_sass/jekyll-theme-chirpy.scss b/_sass/jekyll-theme-chirpy.scss index f23275e..1b64bf4 100644 --- a/_sass/jekyll-theme-chirpy.scss +++ b/_sass/jekyll-theme-chirpy.scss @@ -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 */ diff --git a/assets/js/data/search.json b/assets/js/data/search.json index 30833b9..76bee41 100644 --- a/assets/js/data/search.json +++ b/assets/js/data/search.json @@ -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 }}", diff --git a/assets/js/dist/categories.min.js b/assets/js/dist/categories.min.js index de6f17d..fe9fdc2 100644 --- a/assets/js/dist/categories.min.js +++ b/assets/js/dist/categories.min.js @@ -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 */ diff --git a/assets/js/dist/commons.min.js b/assets/js/dist/commons.min.js index b058bbe..08fcb30 100644 --- a/assets/js/dist/commons.min.js +++ b/assets/js/dist/commons.min.js @@ -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 */ diff --git a/assets/js/dist/home.min.js b/assets/js/dist/home.min.js index 3aeeb3a..f3f0116 100644 --- a/assets/js/dist/home.min.js +++ b/assets/js/dist/home.min.js @@ -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 */ diff --git a/assets/js/dist/page.min.js b/assets/js/dist/page.min.js index fa76b1b..01f780e 100644 --- a/assets/js/dist/page.min.js +++ b/assets/js/dist/page.min.js @@ -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 */ diff --git a/assets/js/dist/post.min.js b/assets/js/dist/post.min.js index 86265c0..549acc5 100644 --- a/assets/js/dist/post.min.js +++ b/assets/js/dist/post.min.js @@ -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 */ diff --git a/assets/js/dist/pvreport.min.js b/assets/js/dist/pvreport.min.js index 1cc998e..815a9f8 100644 --- a/assets/js/dist/pvreport.min.js +++ b/assets/js/dist/pvreport.min.js @@ -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 */ diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 6ad115e..f7ee7e4 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -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"] diff --git a/package.json b/package.json index 70efb7d..9ef44e3 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/tools/init.sh b/tools/init.sh index ab90a61..e8c7b18 100755 --- a/tools/init.sh +++ b/tools/init.sh @@ -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!" diff --git a/tools/release.sh b/tools/release.sh index ef5892b..00a363a 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -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() {