Skip to content

Commit 6e6b647

Browse files
committed
docs: migrate upgrade details to the wiki
1 parent 388efb1 commit 6e6b647

File tree

2 files changed

+16
-42
lines changed

2 files changed

+16
-42
lines changed

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
<details>
2222
<summary>
23-
<i>Click to check out the features</i>
23+
<i>Click to view features</i>
2424
</summary>
2525
<p>
2626

27-
- Dark/Light Theme Mode
27+
- Dark / Light Theme Mode
2828
- Localized UI language
2929
- Pinned Posts
3030
- Hierarchical Categories
@@ -34,9 +34,9 @@
3434
- Syntax Highlighting
3535
- Mathematical Expressions
3636
- Mermaid Diagram & Flowchart
37-
- Dark/Light Mode Images
37+
- Dark / Light Mode Images
3838
- Embed Videos
39-
- Disqus/Utterances/Giscus Comments
39+
- Disqus / Utterances / Giscus Comments
4040
- Search
4141
- Atom Feeds
4242
- Google Analytics
@@ -71,7 +71,7 @@ _Open Source Development_ license.
7171

7272
## Sponsoring
7373

74-
If you would like to sponsor this project, the following options are available.
74+
If you'd like to sponsor this project, the following options are available.
7575

7676
[![Ko-fi](https://img.shields.io/badge/-Buy%20Me%20a%20Coffee-ff5f5f?logo=ko-fi&logoColor=white)](https://ko-fi.com/coteschung)
7777
[![Wechat Pay](https://img.shields.io/badge/-Tip%20Me%20on%20WeChat-brightgreen?logo=wechat&logoColor=white)][donation]
@@ -81,8 +81,6 @@ If you would like to sponsor this project, the following options are available.
8181

8282
This work is published under [MIT][mit] License.
8383

84-
<!-- ReadMe links -->
85-
8684
[jekyllrb]: https://jekyllrb.com/
8785
[bootstrap]: https://getbootstrap.com/
8886
[icons]: https://fontawesome.com/

_posts/2019-08-09-getting-started.md

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installat
1818
There are two ways to create a new repository for this theme:
1919

2020
- [**Using the Chirpy Starter**](#option-1-using-the-chirpy-starter) - Easy to upgrade, isolates irrelevant project files so you can focus on writing.
21-
- [**Forking on GitHub**](#option-2-forking-on-github) - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended.
21+
- [**GitHub Fork**](#option-2-github-fork) - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended.
2222

2323
#### Option 1. Using the Chirpy Starter
2424

25-
Sign in to GitHub and browse to [**Chirpy Starter**](https://github.com/cotes2020/chirpy-starter/), click the button <kbd>Use this template</kbd> > <kbd>Create a new repository</kbd>, and name the new repository `USERNAME.github.io`, where `USERNAME` represents your GitHub username.
25+
Sign in to GitHub and browse to [**Chirpy Starter**][starter], click the button <kbd>Use this template</kbd> > <kbd>Create a new repository</kbd>, and name the new repository `USERNAME.github.io`, where `USERNAME` represents your GitHub username.
2626

27-
#### Option 2. Forking on GitHub
27+
#### Option 2. GitHub Fork
2828

29-
[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) on GitHub and rename it to `USERNAME.github.io`. Note that the default branch code is under development. To ensure the stability of your site, please switch to the [latest tag][latest-tag] and start writing.
29+
Sign in to GitHub to [fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork), and then rename it to `USERNAME.github.io` (`USERNAME` means your username).
3030

31-
And then execute:
31+
Next, clone your site to local machine. In order to build JavaScript files later, we need to install [Node.js][nodejs], and then run the tool:
3232

3333
```console
3434
$ bash tools/init
@@ -39,15 +39,14 @@ $ bash tools/init
3939

4040
The above command will:
4141

42-
1. Remove the files in `_posts`{: .filepath} from your repository.
43-
44-
2. If the option `--no-gh` is provided, the directory `.github`{: .filepath} will be deleted. Otherwise, set up the GitHub Action workflow by removing the extension `.hook`{: .filepath} of `.github/workflows/pages-deploy.yml.hook`{: .filepath}, and then remove the other files and directories in the folder `.github`{: .filepath}.
45-
46-
3. Create a new commit to save the changes automatically.
42+
1. Check out the code to the [latest tag][latest-tag] (to ensure the stability of your site: as the code for the default branch is under development).
43+
2. Remove non-essential sample files and take care of GitHub-related files.
44+
3. Build JavaScript files and export to `assets/js/dist/`{: .filepath }, then make them tracked by Git.
45+
4. Automatically create a new commit to save the changes above.
4746

4847
### Installing Dependencies
4948

50-
Before running for the first time, go to the root directory of your site, and install dependencies as follows:
49+
Before running local server for the first time, go to the root directory of your site and run:
5150

5251
```console
5352
$ bundle
@@ -142,30 +141,7 @@ $ docker run -it --rm \
142141

143142
Unless you specified the output path, the generated site files will be placed in folder `_site`{: .filepath} of the project's root directory. Now you should upload those files to the target server.
144143

145-
## Upgrading
146-
147-
It depends on how you use the theme:
148-
149-
- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`{: .filepath}), editing the `Gemfile`{: .filepath} and update the version number of the theme gem, for example:
150-
151-
```diff
152-
- gem "jekyll-theme-chirpy", "~> 3.2", ">= 3.2.1"
153-
+ gem "jekyll-theme-chirpy", "~> 4.3", ">= 4.3.2"
154-
```
155-
{: .nolineno file="Gemfile" }
156-
157-
And then execute the following command:
158-
159-
```console
160-
$ bundle update jekyll-theme-chirpy
161-
```
162-
163-
As the version upgrades, the critical files (for details, see the [Startup Template][starter]) and configuration options will change. Please refer to the [Upgrade Guide](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide) to keep your repo's files in sync with the latest version of the theme.
164-
165-
- If you forked from the source project (there will be `gemspec` in the `Gemfile`{: .filepath} of your site), then merge the [latest upstream tags][latest-tag] into your Jekyll site to complete the upgrade.
166-
The merge is likely to conflict with your local modifications. Please be patient and careful to resolve these conflicts.
167-
144+
[nodejs]: https://nodejs.org/
168145
[starter]: https://github.com/cotes2020/chirpy-starter
169-
[workflow]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/workflows/pages-deploy.yml.hook
170146
[pages-workflow-src]: https://docs.github.com/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site#publishing-with-a-custom-github-actions-workflow
171147
[latest-tag]: https://github.com/cotes2020/jekyll-theme-chirpy/tags

0 commit comments

Comments
 (0)