8000 1 by HAN5201 · Pull Request #2 · artynet/LEDE · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

1 #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68fb67b
Create merge-upstream.yml
HAN5201 Mar 5, 2022
5598c89
Merge branch 'artynet:master' into master
HAN5201 Mar 5, 2022
d90207f
Delete merge-upstream.yml
HAN5201 Mar 5, 2022
7e1ab3b
Create merge-upstream.yml
HAN5201 Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
55 changes: 55 additions & 0 deletions .github/工作流程/merge-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#
# This is free software, lisence use MIT.
#
# Copyright (C) 2021 KFERMercer <KFER.Mercer@gmail.com>
#
# <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@v2
with:
ref: master
fetch-depth: 0
lfs: true

- name: Set git config
run : |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git config --global pull.rebase false
git config --global --list
- name: Load upstream commits
run: git pull https://github.com/coolsnowwolf/lede.git --log --no-commit

- name: Apply commit changes
run: |
if [ -f ./.git/MERGE_MSG ]; then
mkdir ./tmp && cp ./.git/MERGE_MSG ./tmp/message
sed -i "1c [bot] AutoMerging: merge all upstream's changes:" ./tmp/message
# sed -i '/^\#.*/d' ./tmp/message
git commit --file="./tmp/message"
else
echo "There is no merge commits."
fi
- name: Push Commits
env:
DOWNSTREAM_BRANCH: master
run: git push origin $DOWNSTREAM_BRANCH
0