Skip to content

Commit 0f5abc8

Browse files
committed
Merge branch 'production'
2 parents 4ddd5c4 + 795ff3f commit 0f5abc8

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

_includes/img-url.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
%}
3030

3131
{% if include.absolute %}
32-
{% assign url = site.url | append: site.base_url | append: url %}
32+
{% assign url = site.url | append: site.baseurl | append: url %}
3333
{% else %}
34-
{% assign url = site.base_url | append: url %}
34+
{% assign url = site.baseurl | append: url %}
3535
{% endif %}
3636
{% endunless %}
3737
{%- endif -%}

docs/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [6.5.2](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.1...v6.5.2) (2024-02-29)
6+
7+
### Bug Fixes
8+
9+
* correct the base URL parameter name ([#1576](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1576)) ([19d6baf](https://github.com/cotes2020/jekyll-theme-chirpy/commit/19d6bafbe1a60614e0d63b961bc73c342a9f6f33)), closes [#1553](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1553)
10+
511
## [6.5.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.0...v6.5.1) (2024-02-26)
612

713
### Bug Fixes

jekyll-theme-chirpy.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = "jekyll-theme-chirpy"
5-
spec.version = "6.5.1"
5+
spec.version = "6.5.2"
66
spec.authors = ["Cotes Chung"]
77
spec.email = ["[email protected]"]
88

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jekyll-theme-chirpy",
3-
"version": "6.5.1",
3+
"version": "6.5.2",
44
"description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
55
"repository": {
66
"type": "git",

tools/release

+6-1
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ branch() {
151151
fi
152152
}
153153

154-
## Build a gem package
154+
## Build a Gem package
155155
build_gem() {
156+
git checkout "$PROD_BRANCH"
157+
156158
# Remove unnecessary theme settings
157159
sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml
158160
rm -f ./*.gem
@@ -168,6 +170,9 @@ build_gem() {
168170

169171
# restore the dist files for future development
170172
mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST"
173+
174+
# back to the default branch
175+
git checkout "$DEFAULT_BRANCH"
171176
}
172177

173178
main() {

0 commit comments

Comments
 (0)