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

script: fix package merging

Browse Source
This commit is contained in:
John Doe
2021-03-07 12:00:13 +08:00
parent c5bb831917
commit 4a5f0e7af1
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,8 @@ jobs:
sudo losetup -P --direct-io $LOOP_DEVICE lede.img
mkdir lede && sudo mount -o nossd,autodefrag,compress=zstd $LOOP_DEVICE lede
if [ -d 'lede/.git' ]; then
cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" && git pull --ff -X theirs
cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" && \
git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge openwrt-18.06 || true
else
sudo chown $USER:$(id -gn) lede && (cd lede && git init && git remote add -t openwrt-18.06-k5.4 -f origin https://github.com/immortalwrt/immortalwrt && git checkout openwrt-18.06-k5.4)
fi