Commita08df06

committed

feat: rename master branch

1 parent850ca73 commita08df06Copy full SHA for a08df06

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ jobs:`
`13`	`13`	`with:`
`14`	`14`	`github_token:${{ github.token }}`
`15`	`15`	`source_ref:${{ github.ref }}`
`16`		`-target_branch:'master'`
	`16`	`+target_branch:'main'`
`17`	`17`	`commit_message_template:'[Automated] Merged {source_ref} into {target_branch}'`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ on:`
`4`	`4`	`pull_request:`
`5`	`5`	`push:`
`6`	`6`	`branches:`
`7`		`- -master`
	`7`	`+ -main`
`8`	`8`
`9`	`9`	`jobs:`
`10`	`10`	`prettier:`
`@@ -20,6 +20,6 @@ jobs:`
`20`	`20`	`uses:creyD/prettier_action@v3.0`
`21`	`21`	`with:`
`22`	`22`	`prettier_options:--write */.{html,js,md}`
`23`		`-commit_message:'docs: prettify code'`
	`23`	`+commit_message:'style: prettify code'`
`24`	`24`	`env:`
`25`	`25`	`GITHUB_TOKEN:${{ secrets.GITHUB_TOKEN }}`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ name: Sync`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`
`5`		`-branches:[master ]`
	`5`	`+branches:[main ]`
`6`	`6`
`7`	`7`	`jobs:`
`8`	`8`	`build:`
`@@ -18,9 +18,10 @@ jobs:`
`18`	`18`	`source-repo:"git@github.com:doocs/coding-interview.git"`
`19`	`19`	`destination-repo:"git@gitee.com:Doocs/coding-interview.git"`
`20`	`20`
`21`		`- -name:Rebuild Gitee Pages`
`22`		`-uses:mizuka-wu/gitee-pages-action@v1.0.0`
	`21`	`+ -name:Build Gitee Pages`
	`22`	`+uses:yanglbme/gitee-pages-action@master`
`23`	`23`	`with:`
`24`		`-repository:doocs/coding-interview`
`25`		`-cookie:${{ secrets.GITEE_COOKIE }}`
`26`		`-branch:master`
	`24`	`+gitee-username:yanglbme`
	`25`	`+gitee-password:${{ secrets.GITEE_PASSWORD }}`
	`26`	`+gitee-repo:doocs/coding-interview`
	`27`	`+branch:main`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#互联网公司 IT 技术面试题集`
`2`	`2`
`3`		`-[![license](https://badgen.net/github/license/doocs/leetcode?color=green)](https://github.com/doocs/coding-interview/blob/master/LICENSE)`
	`3`	`+[![license](https://badgen.net/github/license/doocs/leetcode?color=green)](https://github.com/doocs/coding-interview/blob/main/LICENSE)`
`4`	`4`	`[![stars](https://badgen.net/github/stars/doocs/coding-interview)](https://github.com/doocs/coding-interview/stargazers)`
`5`	`5`	`[![issues](https://badgen.net/github/open-issues/doocs/coding-interview)](https://github.com/doocs/coding-interview/issues)`
`6`	`6`	`[![forks](https://img.shields.io/github/forks/doocs/coding-interview.svg)](https://github.com/doocs/coding-interview/network/members)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,10 @@`
`57`	`57`	`if(/githubusercontent\.com/.test(vm.route.file)){`
`58`	`58`	`url=vm.route.file`
`59`	`59`	`.replace("raw.githubusercontent.com","github.com")`
`60`		`-.replace(/\/master/,"/blob/master");`
	`60`	`+.replace(/\/main/,"/blob/main");`
`61`	`61`	`}else{`
`62`	`62`	`url=`
`63`		`-"https://github.com/doocs/coding-interview/blob/master/"+`
	`63`	`+"https://github.com/doocs/coding-interview/blob/main/"+`
`64`	`64`	`vm.route.file;`
`65`	`65`	`}`
`66`	`66`

Comments

(0)