8000 Merge branch 'master' into production · Goder-0/goder-0.github.io@09b300b · GitHub
[go: up one dir, main page]
Skip to content

Commit 09b300b

Browse files
cotes2020cotes2020
committed
Merge branch 'master' into production
2 parents 7a7818b + 9ffd997 commit 09b300b

File tree

97 files changed

+1336
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1336
-924
lines changed

‎.github/DISCUSSION_TEMPLATE/general.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ body:
99
[contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md).
1010
required: true
1111
12-
- type: dropdown
13-
attributes:
14-
label: What is the topic?
15-
options:
16-
- Sharing tips and tricks
17-
- Just chatting
18-
validations:
19-
required: true
20-
2112
- type: textarea
2213
attributes:
2314
label: Description

‎.github/DISCUSSION_TEMPLATE/ideas.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
body:
2+
- type: textarea
3+
attributes:
4+
label: Description
5+
description: Please describe in detail what you want to share.
6+
validations:
7+
required: true

‎.github/dependabot.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@ version: 2
22
updates:
33
- package-ecosystem: "bundler"
44
directory: "/"
5-
versioning-strategy: increase
6-
groups:
7-
bundler:
8-
dependency-type: "production"
95
schedule:
106
interval: "weekly"
117
- package-ecosystem: "npm"
128
directory: "/"
139
versioning-strategy: increase
1410
groups:
1511
npm:
16-
dependency-type: "development"
12+
update-types:
13+
- "major"
14+
- "minor"
15+
- "patch"
1716
schedule:
1817
interval: "weekly"
1918
- package-ecosystem: "github-actions"

‎.github/workflows/cd.yml

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
11
name: CD
2+
23
on:
34
push:
4-
tags:
5-
- "v[0-9]+.[0-9]+.[0-9]+"
65
branches:
7-
- docs
6+
- production
7+
tags-ignore:
8+
- "**"
89

910
jobs:
10-
launch:
11+
release:
12+
permissions:
13+
contents: write
14+
issues: write
15+
pull-requests: write
1116
runs-on: ubuntu-latest
1217
steps:
13-
- run: |
14-
curl -X POST -H "Accept: application/vnd.github+json" \
15-
-H "Authorization: Bearer ${{ secrets.GH_PAT }}" \
16-
https://api.github.com/repos/${{ secrets.BUILDER }}/dispatches \
17-
-d '{"event_type":"deploy", "client_payload":{"branch": "${{ github.ref_name }}"}}'
18+
- uses: actions/checkout@v4
19+
20+
- uses: ruby/setup-ruby@v1
21+
with:
22+
ruby-version: 3.3
23+
bundler-cache: true
24+
25+
- uses: actions/setup-node@v4
26+
with:
27+
node-version: latest
28+
29+
- run: npm install
30+
- run: npx semantic-release
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
34+
35+
publish:
36+
needs: release
37+
uses: ./.github/workflows/publish.yml

‎.github/workflows/ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: "CI"
22
on:
33
push:
4-
branches-ignore:
5-
- "production"
6-
- "docs"
4+
branches:
5+
- "master"
76
paths-ignore:
87
- ".github/**"
98
- "!.github/workflows/ci.yml"
@@ -12,16 +11,14 @@ on:
1211
- "README.md"
1312
- "LICENSE"
1413
pull_request:
15-
paths:
16-
- "**"
1714

1815
jobs:
1916
build:
2017
runs-on: ubuntu-latest
2118

2219
strategy:
2320
matrix:
24-
ruby: ["3.0", "3.1", "3.2"]
21+
ruby: ["3.1", "3.2", "3.3"]
2522

2623
steps:
2724
- name: Checkout
@@ -37,6 +34,8 @@ jobs:
3734

3835
- name: Setup Node
3936
uses: actions/setup-node@v4
37+
with:
38+
node-version: latest
4039

4140
- name: Build Assets
4241
run: npm i && npm run build

‎.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: "CodeQL"
22

33
on:
44
push:
5+
branches: ["master"]
56
paths: ["_javascript/**/*.js"]
67
pull_request:
78
paths: ["_javascript/**/*.js"]

‎.github/workflows/commitlint.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v4
9-
with:
10-
fetch-depth: 0
11-
- uses: wagoid/commitlint-github-action@v5
9+
- uses: wagoid/commitlint-github-action@v6

‎.github/workflows/publish.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Publish
2+
3+
on:
4+
push:
5+
branches:
6+
- docs
7+
workflow_call:
8+
9+
jobs:
10+
launch:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- run: |
14+
curl -X POST -H "Accept: application/vnd.github+json" \
15+
-H "Authorization: Bearer ${{ secrets.GH_PAT }}" \
16+
https://api.github.com/repos/${{ secrets.BUILDER }}/dispatches \
17+
-d '{"event_type":"deploy", "client_payload":{"branch": "${{ github.ref_name }}"}}'

‎.github/workflows/pages-deploy.yml.hook renamed to ‎.github/workflows/starter/pages-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Setup Ruby
4343
uses: ruby/setup-ruby@v1
4444
with:
45-
ruby-version: 3.2
45+
ruby-version: 3.3
4646
bundler-cache: true
4747

4848
- name: Build site
@@ -53,7 +53,7 @@ jobs:
5353
- name: Test site
5454
run: |
5555
bundle exec htmlproofer _site \
56-
\-\-disable-external=true \
56+
\-\-disable-external \
5757
\-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
5858
5959
- name: Upload site artifact

‎.github/workflows/style-lint.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ name: "Style Lint"
22

33
on:
44
push:
5-
branches-ignore:
6-
- "production"
7-
- "docs"
8-
paths:
9-
- "_sass/**/*.scss"
5+
branches: ["master"]
6+
paths: ["_sass/**/*.scss"]
107
pull_request:
11-
paths:
12-
- "_sass/**/*.scss"
8+
paths: ["_sass/**/*.scss"]
139

1410
jobs:
1511
stylelint:
@@ -21,5 +17,7 @@ jobs:
2117

2218
- name: Setup Node
2319
uses: actions/setup-node@v4
20+
with:
21+
node-version: latest
2422
- run: npm i
2523
- run: npm test

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Gemfile.lock
55

66
# Jekyll cache
77
.jekyll-cache
8+
.jekyll-metadata
89
_site
910

1011
# RubyGems
@@ -16,6 +17,10 @@ package-lock.json
1617

1718
# IDE configurations
1819
.idea
20+
.vscode
21+
!.vscode/settings.json
22+
!.vscode/extensions.json
1923

2024
# Misc
25+
_sass/dist
2126
assets/js/dist

‎.markdownlint.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"commands-show-output": false,
3+
"blanks-around-fences": false,
4+
"line-length": false,
5+
"no-inline-html": {
6+
"allowed_elements": ["kbd", "sub"]
7+
}
8+
}

‎.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// Common formatter
88
"esbenp.prettier-vscode",
99
"foxundermoon.shell-format",
10-
"stylelint.vscode-stylelint"
10+
"stylelint.vscode-stylelint",
11+
"yzhang.markdown-all-in-one"
1112
]
1213
}

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"files.associations": {
88
"*.html": "liquid"
99
},
10+
"[markdown]": {
11+
"editor.defaultFormatter": "yzhang.markdown-all-in-one"
12+
},
1013
// Formatter
1114
"[html][liquid]": {
1215
"editor.defaultFormatter": "Shopify.theme-check-vscode"

‎Gemfile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,5 @@ source "https://rubygems.org"
55
gemspec
66

77
group :test do
8-
gem "html-proofer", "~> 4.4"
8+
gem "html-proofer", "~> 5.0"
99
end
10-
11-
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
12-
# and associated library.
13-
platforms :mingw, :x64_mingw, :mswin, :jruby do
14-
gem "tzinfo", ">= 1", "< 3"
15-
gem "tzinfo-data"
16-
end
17-
18-
# Performance-booster for watching directories on Windows
19-
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
20-
21-
# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
22-
# do not have a Java counterpart.
23-
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]

‎README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
<!-- markdownlint-disable-next-line -->
12
<div align="center">
23

4+
<!-- markdownlint-disable-next-line -->
35
# Chirpy Jekyll Theme
46

57
A minimal, responsive, and feature-rich Jekyll theme for technical writing.
@@ -18,7 +20,7 @@
1820

1921
## Features
2022

21-
- Dark / Light Theme Mode
23+
- Dark Theme
2224
- Localized UI language
2325
- Pinned Posts on Home Page
2426
- Hierarchical Categories
@@ -28,13 +30,13 @@
2830
- Syntax Highlighting
2931
- Mathematical Expressions
3032
- Mermaid Diagrams & Flowcharts
31-
- Dark / Light Mode Images
32-
- Embed Videos
33-
- Disqus / Giscus / Utterances Comments
33+
- Dark Mode Images
34+
- Embed Media
35+
- Comment Systems
3436
- Built-in Search
3537
- Atom Feeds
3638
- PWA
37-
- Google Analytics / GoatCounter
39+
- Web Analytics
3840
- SEO & Performance Optimization
3941

4042
## Documentation
@@ -54,7 +56,7 @@ For details, see the "[Contributing Guidelines][contribute-guide]".
5456
Thanks to [all the contributors][contributors] involved in the development of the project!
5557

5658
[![all-contributors](https://contrib.rocks/image?repo=cotes2020/jekyll-theme-chirpy&columns=16)][contributors]
57-
<sub> —— Made with [contrib.rocks](https://contrib.rocks)</sub>
59+
<sub> — Made with [contrib.rocks](https://contrib.rocks)</sub>
5860

5961
### Third-Party Assets
6062

0 commit comments

Comments
 (0)
0