tmp fix

stupidloud · Oct 14, 2021 · 88bd409 · 88bd409
1 parent 2dd779f
commit 88bd409
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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