8000 feat: rename master branch · cloudhuang/advanced-java@affac4b · GitHub
[go: up one dir, main page]

Skip to content

Commit affac4b

Browse files
committed
feat: rename master branch
1 parent aaa12b7 commit affac4b

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/branch-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ jobs:
1414
with:
1515
github_token: ${{ github.token }}
1616
source_ref: ${{ github.ref }}
17-
target_branch: 'master'
17+
target_branch: 'main'
1818
commit_message_template: '[Automated] Merged {source_ref} into {target_branch}'

.github/workflows/prettier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
prettier:

.github/workflows/sync.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Sync
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
jobs:
88
build:
@@ -23,3 +23,4 @@ jobs:
2323
gitee-username: yanglbme
2424
gitee-password: ${{ secrets.GITEE_PASSWORD }}
2525
gitee-repo: doocs/advanced-java
26+
branch: main

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
[![actions status](https://github.com/doocs/advanced-java/workflows/Sync/badge.svg)](https://github.com/doocs/advanced-java/actions?query=workflow%3ASync)
44
[![actions status](https://github.com/doocs/advanced-java/workflows/Prettier/badge.svg)](https://github.com/doocs/advanced-java/actions?query=workflow%3APrettier)
5-
[![license](https://badgen.net/github/license/doocs/advanced-java?color=green)](https://github.com/doocs/advanced-java/blob/master/LICENSE)
5+
[![license](https://badgen.net/github/license/doocs/advanced-java?color=green)](./LICENSE)
66
[![PRs Welcome](https://badgen.net/badge/PRs/welcome/green)](http://makeapullrequest.com)
77
[![doocs](https://badgen.net/badge/organization/join%20us/green)](https://doocs.github.io/#/?id=how-to-join)
88
[![github](https://badgen.net/badge/⭐/GitHub/blue)](https://github.com/doocs/advanced-java)
99
[![gitee](https://badgen.net/badge/⭐/Gitee/blue)](https://gitee.com/doocs/advanced-java)
1010
[![stars](https://badgen.net/github/stars/doocs/advanced-java)](https://github.com/doocs/advanced-java/stargazers)
1111
[![forks](https://badgen.net/github/forks/doocs/advanced-java)](https://github.com/doocs/advanced-java/network/members)
12-
[![contributors](https://badgen.net/github/contributors/doocs/advanced-java)](https://github.com/doocs/advanced-java/tree/master/docs/from-readers#contributors)
12+
[![contributors](https://badgen.net/github/contributors/doocs/advanced-java)](./docs/from-readers#contributors)
1313
[![issues](https://badgen.net/github/open-issues/doocs/advanced-java)](https://github.com/doocs/advanced-java/issues)
1414
[![original](https://badgen.net/badge/original/%E4%B8%AD%E5%8D%8E%E7%9F%B3%E6%9D%89/red)](https://github.com/doocs/advanced-java)
1515
[![notice](https://badgen.net/badge/notice/%E7%BB%B4%E6%9D%83%E8%A1%8C%E5%8A%A8/red)](./docs/extra-page/rights-defending-action.md)

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
if (/githubusercontent\.com/.test(vm.route.file)) {
106106
url = vm.route.file
107107
.replace("raw.githubusercontent.com", "github.com")
108-
.replace(/\/master/, "/blob/master");
108+
.replace(/\/main/, "/blob/main");
109109
} else {
110110
url =
111-
"https://github.com/doocs/advanced-java/blob/master/" +
111+
"https://github.com/doocs/advanced-java/blob/main/" +
112112
vm.route.file;
113113
}
114114

0 commit comments

Comments
 (0)
0