diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index c66f57f..e98ecaf 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -58,7 +58,7 @@ jobs: run: | cd ~/lede if [ -d 'feeds' ]; then - pushd feeds/package; git restore .; popd + pushd feeds/packages; git restore .; popd pushd feeds/luci; git restore .; popd fi ./scripts/feeds update -a @@ -194,20 +194,20 @@ jobs: mv bin tmp lede/ cd lede p_kernel_digest=$(cat bin/targets/*/*/*.manifest | grep kernel | tail -c 33 | tr -d "\n") - find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | sort | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> .config + find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | sort | xargs -n1 -i echo CONFIG_PACKAGE_{}=y >> .config make defconfig make download -j make target/linux/compile -j$(($(nproc) + 1)) make package/compile -j$(($(nproc) + 1)) IGNORE_ERRORS=m make package/index n_kernel_digest=$(cat bin/targets/*/*/*.manifest | grep kernel | tail -c 33 | tr -d "\n") - sed -i "s/$p_kernel_digest/$n_kernel_digest/" bin/targets/*/*/packages/Packages bin/targets/*/*/*.manifest + sed -i "s/$n_kernel_digest/$p_kernel_digest/" bin/targets/*/*/packages/Packages bin/targets/*/*/packages/Packages.manifest gzip -f bin/targets/*/*/packages/Packages mkdir -p ~/.ssh; echo ${{env.DEPLOY_SSHKEY}} | base64 -d > ~/.ssh/id_ed25519; chmod 600 ~/.ssh/id_ed25519 - rsync -avz --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ - bin/packages/*/* root@imgxxx.net:/usr/share/caddy/$DEVICE/ - rsync -avz --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ - bin/targets/*/*/packages/ root@imgxxx.net:/usr/share/caddy/$DEVICE/core/ + rsync -ach --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ + bin/packages/*/* root@direct.imgxxx.net:/usr/share/caddy/$DEVICE/ + rsync -ach --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ + bin/targets/*/*/packages/ root@direct.imgxxx.net:/usr/share/caddy/$DEVICE/core/ - name: Debug via tmate uses: P3TERX/ssh2actions@main