From f95bc66b5ce44bed63e81a9991705484d5918c1a Mon Sep 17 00:00:00 2001 From: yanglbme Date: Mon, 23 Nov 2020 10:29:05 +0800 Subject: [PATCH] feat: rename master branch --- .github/workflows/branch-merge.yml | 2 +- .github/workflows/prettier.yml | 2 +- .github/workflows/sync.yml | 5 +++-- README.md | 2 +- .../内存池之从内存池申请内存.md | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml index 05f7b15..684776c 100644 --- a/.github/workflows/branch-merge.yml +++ b/.github/workflows/branch-merge.yml @@ -13,5 +13,5 @@ jobs: with: github_token: ${{ github.token }} source_ref: ${{ github.ref }} - target_branch: 'master' + target_branch: 'main' commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 3aaff7d..7227502 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: prettier: diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 954e3ca..2a862b7 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -2,7 +2,7 @@ name: Sync on: push: - branches: [ master ] + branches: [ main ] jobs: build: @@ -28,4 +28,5 @@ jobs: # 注意在 Settings->Secrets 配置 GITEE_PASSWORD gitee-password: ${{ secrets.GITEE_PASSWORD }} # 注意替换为你的 Gitee 仓库 - gitee-repo: doocs/source-code-hunter \ No newline at end of file + gitee-repo: doocs/source-code-hunter + branch: main \ No newline at end of file diff --git a/README.md b/README.md index e64b583..e62aee1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 互联网公司常用框架源码赏析 -[![license](https://badgen.net/github/license/doocs/source-code-hunter?color=green)](https://github.com/doocs/source-code-hunter/blob/master/LICENSE) +[![license](https://badgen.net/github/license/doocs/source-code-hunter?color=green)](https://github.com/doocs/source-code-hunter/blob/main/LICENSE) [![stars](https://badgen.net/github/stars/doocs/source-code-hunter)](https://github.com/doocs/source-code-hunter/stargazers) [![contributors](https://badgen.net/github/contributors/doocs/source-code-hunter)](https://github.com/doocs/source-code-hunter/graphs/contributors) [![help-wanted](https://badgen.net/github/label-issues/doocs/source-code-hunter/help%20wanted/open)](https://github.com/doocs/source-code-hunter/labels/help%20wanted) diff --git a/docs/Netty/Netty技术细节源码分析/内存池之从内存池申请内存.md b/docs/Netty/Netty技术细节源码分析/内存池之从内存池申请内存.md index 44d87ce..32ee939 100644 --- a/docs/Netty/Netty技术细节源码分析/内存池之从内存池申请内存.md +++ b/docs/Netty/Netty技术细节源码分析/内存池之从内存池申请内存.md @@ -21,4 +21,4 @@ 以上几个 PoolChunkList，由符合各个内存利用率的 poolChunk 组成，这几个 PoolChunkList 之间又互相首尾连接组成队列，方便 PoolChunk 在各个队列中根据自己当前的利用率进行转移到对应的位置上。 最后，当申请的内存大于一个 poolChunk 大小的时候将会直接申请一段非池化的内存返回，并不会占用内存池中的内存空间。 -最后，到了从 poolChunk 中申请内存的场景，这一部分在[该文](https://github.com/doocs/source-code-hunter/blob/master/docs/Netty/Netty技术细节源码分析/内存池之PoolChunk设计与实现.md)中已经详细说明，这部分也是内存池中获取内存的最后一步。 +最后，到了从 poolChunk 中申请内存的场景，这一部分在[该文](https://github.com/doocs/source-code-hunter/blob/main/docs/Netty/Netty技术细节源码分析/内存池之PoolChunk设计与实现.md)中已经详细说明，这部分也是内存池中获取内存的最后一步。