Skip to content

Commit f91e476

Browse files
author
ihoneys
committed
docs: some
1 parent 37183dd commit f91e476

File tree

3 files changed

+34
-12
lines changed

3 files changed

+34
-12
lines changed

.github/workflows/docsearch.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: docsearch
2+
3+
on:
4+
deployment
5+
6+
jobs:
7+
algolia:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Get the content of docsearch.json as config
13+
id: algolia_config
14+
run: echo "::set-output name=config::$(cat docsearch.json | jq -r tostring)"
15+
16+
- name: Run algolia/docsearch-scraper image
17+
env:
18+
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
19+
ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
20+
CONFIG: ${{ steps.algolia_config.outputs.config }}
21+
run: |
22+
docker run \
23+
--env APPLICATION_ID=${ALGOLIA_APP_ID} \
24+
--env API_KEY=${ALGOLIA_API_KEY} \
25+
--env "CONFIG=${CONFIG}" \
26+
algolia/docsearch-scraper

docs/skill/git/index.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ git rebase -i 6ad457782
127127
:2,$s/pick/f/g
128128
```
129129

130-
![Untitled](./img/Untitled.png)
131-
132-
比如说合并 commit ,如果说我想合并 fix 小数点上面的所有 commit 节点,
130+
比如说合并 commit ,如果说我想合并某个节点上面的所有 commit 节点,
133131

134132
我们就可以操作
135133

@@ -203,8 +201,6 @@ git checkout {commitId} {本地新分支名}
203201

204202
### 退出合并
205203

206-
![Untitled](./img/Untitled2.png)
207-
208204
```bash
209205
git merge --abort
210206
```
@@ -289,9 +285,9 @@ git push origin feature/1025848-eshop -f
289285
git ls-remote --heads
290286
# abc150b184007a4248a0e993b547194494964e17 refs/heads/master
291287

292-
仓库地址
288+
# 仓库地址
293289
git ls-remote --get-url
294-
# git@code.guanmai.cn:fe-x/gm_api_script.git
290+
# git@xxxx:fe-x/xxx.git
295291
```
296292

297293
git log 查看远程分支 log 信息

docusaurus.config.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ module.exports = {
4646
},
4747
],
4848
},
49-
// algolia: {
50-
// apiKey: "",
51-
// indexName: "",
52-
// appId: "",
53-
// },
49+
algolia: {
50+
apiKey: "b8a6e97687c942d5512e9d643ac59481",
51+
indexName: "blog_data",
52+
appId: "QEASEITM3D",
53+
},
5454
footer: {
5555
style: "dark",
5656
copyright: `Copyright © ${new Date().getFullYear()} My Project, Inc. Built with Docusaurus.`,

0 commit comments

Comments
 (0)