feat: store backup in another branch #253
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
很抱歉前段时间学校里事情太多忙忘了，这样应该符合要求了。 |
|
之后您需要新建一个分支专门存放 BACKUP 目录等，可以将 master 分支里的您还需要的文件移动到新分支。大体可以参考我的仓库 |
yihong0618
reviewed
Nov 23, 2022
Comment on lines
+52
to
+65
| cp back/README.md main/README.md | ||
| cp back/feed.xml main/feed.xml | ||
| cd main | ||
| git config --local user.email "${{ env.GITHUB_EMAIL }}" | ||
| git config --local user.name "${{ env.GITHUB_NAME }}" | ||
| git add BACKUP/*.md | ||
| git commit -a -m 'update new blog' || echo "nothing to commit" | ||
| git push || echo "nothing to push" | ||
|
|
||
| git add README.md feed.xml | ||
| git commit --amend --no-edit | ||
| git push --force | ||
| cd ../back | ||
| git config --local user.email "${{ env.GITHUB_EMAIL }}" | ||
| git config --local user.name "${{ env.GITHUB_NAME }}" | ||
| git add . | ||
| git commit -m "update new blog" | ||
| git push |
Comment on lines
+16
to
+18
| MD_FOOT = """ | ||
| --- | ||
| Thanks for [yihong0618](https://github/com/yihong0618/gitblog) |
| [RSS Feed](https://raw.githubusercontent.com/{repo_name}/master/feed.xml) | ||
| MD_HEAD = """# Gitblog | ||
| My personal blog using issues and GitHub Actions（随意转载，无需署名） | ||
| Subscribe to [RSS Feed](https://raw.githubusercontent.com/{repo_name}/master/feed.xml) |
|
|
||
|
|
||
| def add_md_top(repo, md, me): | ||
| top_issues = list(get_top_issues(repo)) | ||
| if not TOP_ISSUES_LABELS or not top_issues: | ||
| return | ||
| with open(md, "a+", encoding="utf-8") as md: | ||
| md.write("## 置顶文章\n") | ||
| md.write("\n## 置顶文章\n\n") |
Comment on lines
+170
to
+174
| md.write("\n## 友情链接\n\n") | ||
| md.write(s) | ||
| md.write("\n> 通过向以下 issues 评论的形式，将您的博客加入友链列表\n> \n") | ||
| for issue in friends_issues: | ||
| md.write(f"> [{issue.title}]({issue.html_url})\n> \n") |
Comment on lines
+158
to
+160
| friends_issues = repo.get_issues(labels=FRIENDS_LABELS) | ||
| if not FRIENDS_LABELS or not friends_issues: | ||
| return |
|
|
||
|
|
||
| def add_md_recent(repo, md, me, limit=5): | ||
| count = 0 | ||
| with open(md, "a+", encoding="utf-8") as md: | ||
| # one the issue that only one issue and delete (pyGitHub raise an exception) | ||
| try: | ||
| md.write("## 最近更新\n") | ||
| md.write("\n## 最近更新\n\n") |
Comment on lines
210
to
211
| if issues.totalCount: | ||
| md.write("## " + label.name + "\n") | ||
| issues = sorted(issues, key=lambda x: x.created_at, reverse=True) |
我懂了，这个我需要考虑下，我想保持原有的 |
没关系，哈哈。 有几个我不想动的，你的可以作为 fork 继续更新，因为这个本质上还是私人项目我没有特别想做的通用
如果你想用你的项目提 PR, 你可以研究下怎么同步我的然后切分支提，这样就没那么多冲突了 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
save backups in new branch, and do not change commit log in master branch