asandikci.com/web
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/6.5.2' into production

Browse source
This commit is contained in:
Cotes Chung 2024-03-01 03:51:21 +08:00
commit c41672b2e0
No known key found for this signature in database
GPG key ID: 0D9E54843167A808
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_includes/img-url.html
View file

@ -29,9 +29,9 @@
%} %}
{% if include.absolute %} {% if include.absolute %}
{% assign url = site.url | append: site.base_url | append: url %} {% assign url = site.url | append: site.baseurl | append: url %}
{% else %} {% else %}
{% assign url = site.base_url | append: url %} {% assign url = site.baseurl | append: url %}
{% endif %} {% endif %}
{% endunless %} {% endunless %}
{%- endif -%} {%- endif -%}

7
tools/release
View file

@ -151,8 +151,10 @@ branch() {
fi fi
} }
## Build a gem package ## Build a Gem package
build_gem() { build_gem() {
git checkout "$PROD_BRANCH"
# Remove unnecessary theme settings # Remove unnecessary theme settings
sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml
rm -f ./*.gem rm -f ./*.gem
@ -168,6 +170,9 @@ build_gem() {
# restore the dist files for future development # restore the dist files for future development
mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST" mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST"
# back to the default branch
git checkout "$DEFAULT_BRANCH"
} }
main() { main() {