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

build: fix deploy

Browse Source
This commit is contained in:
John Doe
2021-03-16 17:53:27 +08:00
parent 951e753839
commit 69ec0a3505
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ jobs:
run: | run: |
cd ~/lede cd ~/lede
if [ -d 'feeds' ]; then if [ -d 'feeds' ]; then
pushd feeds/package; git restore .; popd pushd feeds/packages; git restore .; popd
pushd feeds/luci; git restore .; popd pushd feeds/luci; git restore .; popd
fi fi
./scripts/feeds update -a ./scripts/feeds update -a
@@ -194,20 +194,20 @@ jobs:
mv bin tmp lede/ mv bin tmp lede/
cd lede cd lede
p_kernel_digest=$(cat bin/targets/*/*/*.manifest | grep kernel | tail -c 33 | tr -d "\n") 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 defconfig
make download -j make download -j
make target/linux/compile -j$(($(nproc) + 1)) make target/linux/compile -j$(($(nproc) + 1))
make package/compile -j$(($(nproc) + 1)) IGNORE_ERRORS=m make package/compile -j$(($(nproc) + 1)) IGNORE_ERRORS=m
make package/index make package/index
n_kernel_digest=$(cat bin/targets/*/*/*.manifest | grep kernel | tail -c 33 | tr -d "\n") 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 gzip -f bin/targets/*/*/packages/Packages
mkdir -p ~/.ssh; echo ${{env.DEPLOY_SSHKEY}} | base64 -d > ~/.ssh/id_ed25519; chmod 600 ~/.ssh/id_ed25519 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" \ rsync -ach --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
bin/packages/*/* root@imgxxx.net:/usr/share/caddy/$DEVICE/ bin/packages/*/* root@direct.imgxxx.net:/usr/share/caddy/$DEVICE/
rsync -avz --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ rsync -ach --progress -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
bin/targets/*/*/packages/ root@imgxxx.net:/usr/share/caddy/$DEVICE/core/ bin/targets/*/*/packages/ root@direct.imgxxx.net:/usr/share/caddy/$DEVICE/core/
- name: Debug via tmate - name: Debug via tmate
uses: P3TERX/ssh2actions@main uses: P3TERX/ssh2actions@main