From 3d6304efd8afeb18a4d9c7f4c52981b9d12cdf73 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 2 Oct 2021 05:07:55 +0800 Subject: [PATCH 1/5] Build on the release branches to reuse the travis cache --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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: From 565ad9229c334709601fe15b80bf9dcf246128eb Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 3 Oct 2021 18:39:00 +0800 Subject: [PATCH 2/5] Remove the value of `img_cdn` and `avatar` from the gem package --- tools/init.sh | 2 +- tools/release.sh | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/init.sh b/tools/init.sh index ab90a61..f6d6a4a 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 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() { From fa15aebbca9bb31a76071e7ba3495ecbacfef3fe Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 11 Oct 2021 01:50:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Fix=20the=20failure=20of=20the=20init-tool?= =?UTF-8?q?=20with=20the=20`=E2=80=94no-gh`=20option=20(resolve=20#429)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/init.sh b/tools/init.sh index f6d6a4a..e8c7b18 100755 --- a/tools/init.sh +++ b/tools/init.sh @@ -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!" From 30d3249782b84c95ee8f9b175e8238ce9ed91a2a Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 12 Oct 2021 00:13:26 +0800 Subject: [PATCH 4/5] Remove the host of the search result URLs --- _includes/search-loader.html | 2 +- assets/js/data/search.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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 }}", From a5b8e7862b5460a52a3a951cb1892716f78c78c7 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 15 Oct 2021 00:45:13 +0800 Subject: [PATCH 5/5] Bump version to 4.3.2 --- _javascript/copyright | 2 +- _sass/jekyll-theme-chirpy.scss | 2 +- assets/js/dist/categories.min.js | 2 +- assets/js/dist/commons.min.js | 2 +- assets/js/dist/home.min.js | 2 +- assets/js/dist/page.min.js | 2 +- assets/js/dist/post.min.js | 2 +- assets/js/dist/pvreport.min.js | 2 +- jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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/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": {