Merge branch 'hotfix/6.5.1' into production

This commit is contained in:
Cotes Chung 2024-02-27 02:44:29 +08:00
commit 8849afe5cf
No known key found for this signature in database
GPG key ID: 0D9E54843167A808
2 changed files with 5 additions and 5 deletions

View file

@ -37,7 +37,7 @@ jobs:
- name: Setup Pages - name: Setup Pages
id: pages id: pages
uses: actions/configure-pages@v3 uses: actions/configure-pages@v4
- name: Setup Ruby - name: Setup Ruby
uses: ruby/setup-ruby@v1 uses: ruby/setup-ruby@v1
@ -57,7 +57,7 @@ jobs:
\-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/" \-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
- name: Upload site artifact - name: Upload site artifact
uses: actions/upload-pages-artifact@v1 uses: actions/upload-pages-artifact@v3
with: with:
path: "_site${{ steps.pages.outputs.base_path }}" path: "_site${{ steps.pages.outputs.base_path }}"
@ -70,4 +70,4 @@ jobs:
steps: steps:
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v2 uses: actions/deploy-pages@v4

View file

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