openwrt-ci: match all platforms

yunri · Dec 11, 2019 · ab8205c · ab8205c
1 parent 12e7f52
commit ab8205c
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/openwrt-ci.yml b/openwrt-ci.yml
@@ -187,22 +187,16 @@ jobs:
       - name: Make download
         run: |
           make download -j8
-          find dl -size -1024c -exec ls -l {} \;
-          find dl -size -1024c -exec rm -f {} \;
+          find ./dl/ -size -1024c -exec rm -f {} \;
 
       - name: Compile firmware
         run: DEBIAN_FRONTEND=noninteractive make -j$(nproc) V=s
 
-      - name: Assemble artifact
-        run: |
-          rm -rf ./artifact/
-          mkdir -p ./artifact/
-          find ./bin/targets/ -name "*combined*img*" | xargs -i mv -f {} ./artifact/
-          find ./bin/targets/ -name "*efi*img*" | xargs -i mv -f {} ./artifact/
-          find ./bin/targets/ -name "*sysupgrade*bin*" | xargs -i mv -f {} ./artifact/
+      - name: Prepare artifact
+        run: find ./bin/targets/ -type d -name "packages" | xargs rm -rf {}
 
       - name: Upload artifact
         uses: actions/upload-artifact@master
         with:
           name: OpenWrt firmware
-          path: ./artifact/
+          path: ./bin/targets/