From 19d6bafbe1a60614e0d63b961bc73c342a9f6f33 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 1 Mar 2024 02:50:10 +0800 Subject: [PATCH 1/2] fix: correct the base URL parameter name (#1576) #1553 introduced --- _includes/img-url.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/img-url.html b/_includes/img-url.html index 1483652..2f8d401 100644 --- a/_includes/img-url.html +++ b/_includes/img-url.html @@ -29,9 +29,9 @@ %} {% if include.absolute %} - {% assign url = site.url | append: site.base_url | append: url %} + {% assign url = site.url | append: site.baseurl | append: url %} {% else %} - {% assign url = site.base_url | append: url %} + {% assign url = site.baseurl | append: url %} {% endif %} {% endunless %} {%- endif -%} From 9cc62e703faf248b43e8971e7f82782daad5bbab Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 1 Mar 2024 03:11:17 +0800 Subject: [PATCH 2/2] build(release): build the gem on the `production` branch (#1577) --- tools/release | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/release b/tools/release index bb54a0b..9ca63dc 100755 --- a/tools/release +++ b/tools/release @@ -151,8 +151,10 @@ branch() { fi } -## Build a gem package +## Build a Gem package build_gem() { + git checkout "$PROD_BRANCH" + # Remove unnecessary theme settings sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml rm -f ./*.gem @@ -168,6 +170,9 @@ build_gem() { # restore the dist files for future development mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST" + + # back to the default branch + git checkout "$DEFAULT_BRANCH" } main() {