diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index fb0122f..ab6ac5d 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -47,6 +47,7 @@ jobs: cd friendlywrt-rk3328 sed -i '/=m/d;/CONFIG_AUTOREMOVE/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/CONFIG_DEVEL/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d' configs/config_rk3328 cd friendlywrt + git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git checkout upstream/master -- feeds.conf.default