Revert "*tmp fix*"

This reverts commit 87a8c165bd.
This commit is contained in:
John Doe
2021-03-08 05:15:54 +08:00
parent e042a77563
commit 2f94348410

View File

@@ -48,7 +48,7 @@ jobs:
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 remote set-branches --add origin openwrt-18.06
git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge --commit origin/openwrt-18.06 || true git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge --commit origin/openwrt-18.06
else 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) 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 fi
@@ -88,9 +88,6 @@ jobs:
while true; do make download -j && break || true; done while true; do make download -j && break || true; done
while true; do make package/download -j && break || true; done while true; do make package/download -j && break || true; done
#tmpfix
make package/arm-trusted-firmware-rk3328/{clean,compile}
#tmpfix
make -j$(($(nproc) + 1)) || make V=sc make -j$(($(nproc) + 1)) || make V=sc
echo "=======================" echo "======================="
echo "Space usage:" echo "Space usage:"