Skip to content

Commit

Permalink
add merge upstream automatically
Browse files Browse the repository at this point in the history
  • Loading branch information
KFERMercer committed Dec 3, 2019
1 parent ab61ac7 commit 49ba996
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# 使用 GitHub Actions 的 OpenWrt 在线集成自动编译环境.

## 12月4日更新: 增加自动同步上游并提交的CI. (`merge-upstream.yml`) →[使用教程](https://github.com/KFERMercer/OpenWrt-CI/blob/master/merge-upstream.md)

## 自动定制固件, 自动生成配置文件, 无需上传配置, 依赖自动调整.

## 代码更新即自动编译, 兼容 coolsnowwolf/lede 以及 OpenWrt trunk
Expand Down
1 change: 1 addition & 0 deletions merge-upstream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# 待编写
41 changes: 41 additions & 0 deletions merge-upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# This is free software, lisence use MIT.
#
# Copyright (C) 2019 KFERMercer <[email protected]>
#
# <https://github.com/KFERMercer/OpenWrt-CI>
#

name: Merge-upstream

on:
push:
branches:
- master
schedule:
- cron: 30 19 * * *

jobs:
merge:

runs-on: ubuntu-latest

steps:

- name: Checkout
uses: actions/checkout@master
with:
ref: master

- name: Set git identity
run : |
git config --global user.email "[email protected]"
git config --global user.name "KFERMercer"
- name: Load upstream commits
run: git pull https://github.com/coolsnowwolf/lede.git --no-edit --allow-unrelated-histories --strategy-option ours

- name: Push Commits
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit 49ba996

Please sign in to comment.