yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tmp fix: suspend merging mainline

Browse Source
This commit is contained in:
John Doe
2021-03-27 14:37:16 +08:00
parent 19101cdce3
commit 882a6b527c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/lo-test.yml vendored
View File

@@ -48,8 +48,9 @@ jobs:
mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede
if [ -d 'lede/.git' ]; then if [ -d 'lede/.git' ]; then
cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git remote set-branches --add origin openwrt-18.06 git fetch && git reset --hard origin/openwrt-18.06-k5.4
git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge -X theirs --no-edit origin/openwrt-18.06 #git remote set-branches --add origin openwrt-18.06
#git merge -X theirs --no-edit origin/openwrt-18.06
else else
sudo chown $USER:$(id -gn) lede && git clone -b openwrt-18.06-k5.4 --single-branch lede sudo chown $USER:$(id -gn) lede && git clone -b openwrt-18.06-k5.4 --single-branch lede
fi fi