diff --git a/FMworkflows/Delete older releases and workflows.yml b/FMworkflows/Delete older releases and workflows.yml new file mode 100644 index 0000000..f61f2dd --- /dev/null +++ b/FMworkflows/Delete older releases and workflows.yml @@ -0,0 +1,35 @@ +#========================================================================== +# https://github.com/ophub/amlogic-s9xxx-armbian +# Description: Delete older releases and workflows runs +#========================================================================== + +name: Delete older releases and workflows + +on: + schedule: + - cron: '0 */6 * * *' +# 这里默认12小时执行一次 + + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + if: ${{ github.event.repository.owner.id }} == ${{ github.event.sender.id }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Delete releases and workflows runs + uses: xinyi1984/delete-releases-workflows@main + with: + #delete_releases: true + #delete_tags: true + #releases_keep_latest: 1 + #releases_keep_keyword: true + delete_workflows: true + workflows_keep_day: true + workflows_keep_keyword: 0 + out_log: false + gh_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/FMworkflows/Merge upstream dev→dev.yml b/FMworkflows/Merge upstream dev→dev.yml new file mode 100644 index 0000000..52500fb --- /dev/null +++ b/FMworkflows/Merge upstream dev→dev.yml @@ -0,0 +1,29 @@ +name: Merge upstream dev→dev + +on: + # 推送代码后触发 + push: + # 定时任务触发,使用 cron 规则,这里默认一小时执行一次 + schedule: + - cron: '0 * * * *' + workflow_dispatch: + +jobs: + merge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Merge upstream + run: | + # 使用自己的用户名替换 username + git config --global user.name 'xinyi1984' + git config --global user.email 'xinyi1984@users.noreply.github.com' + git pull --unshallow + # 自行替换要同步的上游仓库地址 + git remote add upstream https://github.com/FongMi/TV.git + git fetch upstream + git checkout --track origin/dev + git merge upstream/dev + git push origin dev + + diff --git a/FMworkflows/Merge upstream fongmi→fongmi.yml b/FMworkflows/Merge upstream fongmi→fongmi.yml new file mode 100644 index 0000000..98bacb3 --- /dev/null +++ b/FMworkflows/Merge upstream fongmi→fongmi.yml @@ -0,0 +1,27 @@ +name: Merge upstream fongmi→fongmi + +on: + # 推送代码后触发 + push: + # 定时任务触发,使用 cron 规则,这里默认一小时执行一次 + schedule: + - cron: '0 * * * *' + workflow_dispatch: + +jobs: + merge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Merge upstream + run: | + # 使用自己的用户名替换 username + git config --global user.name 'xinyi1984' + git config --global user.email 'xinyi1984@users.noreply.github.com' + git pull --unshallow + # 自行替换要同步的上游仓库地址 + git remote add upstream https://github.com/FongMi/TV.git + git fetch upstream + git checkout --track origin/fongmi + git merge upstream/fongmi + git push origin fongmi diff --git a/FMworkflows/Merge upstream release→release.yml b/FMworkflows/Merge upstream release→release.yml new file mode 100644 index 0000000..a2e5025 --- /dev/null +++ b/FMworkflows/Merge upstream release→release.yml @@ -0,0 +1,27 @@ +name: Merge upstream release→release + +on: + # 推送代码后触发 + push: + # 定时任务触发,使用 cron 规则,这里默认一小时执行一次 + schedule: + - cron: '0 * * * *' + workflow_dispatch: + +jobs: + merge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Merge upstream + run: | + # 使用自己的用户名替换 username + git config --global user.name 'xinyi1984' + git config --global user.email 'xinyi1984@users.noreply.github.com' + git pull --unshallow + # 自行替换要同步的上游仓库地址 + git remote add upstream https://github.com/FongMi/TV.git + git fetch upstream + git checkout release + git merge upstream/release + git push origin release