From 88bd4090ba5192c55f9eb5a1e2bc182f45009034 Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 14 Oct 2021 11:25:59 +0800 Subject: [PATCH] tmp fix --- .github/workflows/lo-test.yml | 3 ++- scripts/merge_files.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index bbc891cf6a..aa0f19d75f 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -91,7 +91,7 @@ jobs: make defconfig && cat .config - name: Clean build cache - if: ${{ github.event.client_payload.package_clean == 'true' || github.event.inputs.device != '' }} + if: ${{ github.event.client_payload.package_clean == 'true' }} run: | cd ~/lede df -h . @@ -204,6 +204,7 @@ jobs: ulimit -SHn 65000 curl -L https://github.com/klever1988/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf - mv *imagebuilder* ib && cd ib + set -x . $GITHUB_WORKSPACE/scripts/merge_files.sh cp -a packages files/local_feed sed -i 's/luci-app-[^ ]*//g' include/target.mk $(find target/ -name Makefile) diff --git a/scripts/merge_files.sh b/scripts/merge_files.sh index 34c66ac42a..e2c5f15c66 100644 --- a/scripts/merge_files.sh +++ b/scripts/merge_files.sh @@ -1,3 +1,4 @@ +set -x mv $GITHUB_WORKSPACE/files ./ if [ $DEVICE = 'r2s' -o $DEVICE = 'r2c' ]; then mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d