Skip to content
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.

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

git pull net ver test #2276

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/workflows/merge-upstream.yml
@@ -0,0 +1,41 @@

#
# This is free software, lisence use MIT.
#
# Copyright (C) 2019 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@master
with:
ref: master

- name: Set git identity
run : |
git config --global user.email "KFER.Mercer@gmail.com"
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 }}
213 changes: 0 additions & 213 deletions .github/workflows/openwrt-ci.yml

This file was deleted.