Skip to content

Commit

Permalink
Move jekyll to its own folder (#502)
Browse files Browse the repository at this point in the history
* move jekyll related files to jekyll/ folder

* seperate gitignore to jekyll

* fix script to use new jekyll folder

* add sitemap index

* fix names

* 0.6.0

* 0.6.1

* add make install

* 0.6.2
  • Loading branch information
huan authored Aug 29, 2020
1 parent 0bf76aa commit b5d981a
Show file tree
Hide file tree
Showing 1,138 changed files with 85 additions and 1,020 deletions.
14 changes: 6 additions & 8 deletions .file-name-linter.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{
"rules": {
"_posts": [
"^_posts/",
"jekyll/_posts": [
"/[0-9\\-a-z]+\\.",
"\\.md$"
],
"assets": [
"^assets/",
"jekyll/assets": [
"/[0-9\\-a-z]+\\.",
"\\.(jpg|jpeg|png|gif|webp|zip|pdf|docx|doc|txt)$"
]
},
"ignore": [
"assets/js",
"assets/css",
"assets/images",
"assets/developers/wechaty",
"jekyll/assets/js",
"jekyll/assets/css",
"jekyll/assets/images",
"jekyll/assets/developers/wechaty",
"tests/fixtures"
]
}
9 changes: 3 additions & 6 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- name: Install Dependencies
run: |
npm install
sudo make install
run: make install
- name: Test
run: npm test
- name: Build
Expand Down Expand Up @@ -57,15 +55,14 @@ jobs:
git checkout master
- name: Install dependencies
run: |
npm install
sudo make install
make install
- name: Bind git worktree with new-gh-pages folder and gh-pages branch
run: |
rm -fr new-gh-pages
git worktree add new-gh-pages gh-pages
- name: Build and copy all homepage files to new-gh-pages/ together
run: |
bash -x ./scripts/build.sh new-gh-pages
bash -x ./scripts/build-all.sh new-gh-pages
- name: Deploy new-gh-pages
run: |
pushd new-gh-pages
Expand Down
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
_site/
.jekyll-cache/
node_modules/
t/
t.*

.sass-cache
.jekyll-metadata
Gemfile.lock
.DS_Store
.*.swp
package-lock.json

.idea
.DS_Store

Expand Down
34 changes: 0 additions & 34 deletions 404.html

This file was deleted.

1 change: 0 additions & 1 deletion CNAME

This file was deleted.

31 changes: 11 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,38 +1,29 @@
# Makefile for awesome-chatboot
# Author: Huan LI <[email protected]> github.com/huan
# Makefile for wechaty.js.org
# Author: Huan LI <[email protected]> https://github.com/huan

.PHONY: all
all: serve
all: install

.PHONY: install
install:
gem install bundler
bundle install && bundle update
cd jekyll && sudo make install
npm install

.PHONY: test
test:
npm run test

.PHONY: code
code:
code .

.PHONY: clean
clean:
rm -fr _site
rm -fr jekyll/_site/
rm -fr docusaurus/build/
rm -fr new-gh-pages/

.PHONY: build
build:
bundle exec jekyll build

.PHONY: serve
serve:
bundle exec jekyll serve --incremental

.PHONY: docker
docker:
docker-compose -f config/docker-compose.yml up
cd jekyll && make build
cd docusaurus && npm run build

.PHONY: fit-image
fit-image:
./scripts/fit-image.sh assets/
./scripts/fit-image.sh jekyll/assets/
Loading

0 comments on commit b5d981a

Please sign in to comment.