Add files via upload
This commit is contained in:
@@ -0,0 +1,28 @@
|
|||||||
|
name: Merge upstream release→release
|
||||||
|
|
||||||
|
on:
|
||||||
|
# 推送代码后触发
|
||||||
|
push:
|
||||||
|
# 定时任务触发,使用 cron 规则,这里默认一小时执行一次 '0 * * * *'
|
||||||
|
schedule:
|
||||||
|
- cron: '0 * * * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
merge:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- name: Merge upstream
|
||||||
|
run: |
|
||||||
|
# 使用自己的用户名替换 username
|
||||||
|
git config --global user.name 'dlgt7'
|
||||||
|
git config --global user.email '120@qq.com'
|
||||||
|
git pull --unshallow
|
||||||
|
# 自行替换要同步的上游仓库地址
|
||||||
|
git remote add upstream https://github.com/takagen99/Box.git
|
||||||
|
git fetch upstream
|
||||||
|
git checkout main
|
||||||
|
git merge upstream/main
|
||||||
|
git pull origin main
|
||||||
|
git push origin main
|
||||||
Reference in New Issue
Block a user