Awesome upload

linlinlin1992 · Dec 12, 2019 · 621adde · 621adde
1 parent 32fd9c5
commit 621adde
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/.github/workflows/build-openwrt-mac.yml b/.github/workflows/build-openwrt-mac.yml
@@ -91,16 +91,23 @@ jobs:
         cd openwrt
         make -j1 V=s
 
-    - name: Upload packages
+    - name: Upload bin directory
       uses: actions/upload-artifact@master
       if: always()
       with:
-        name: OpenWrt packages
-        path: openwrt/bin/packages
+        name: OpenWrt_bin
+        path: openwrt/bin
 
-    - name: Upload targets
+    - name: Organize files
+      if: always()
+      run: |
+        cd openwrt/bin/targets/*/*
+        rm -rf packages
+        echo "::set-env name=FIRMWARE::$(pwd)"
+
+    - name: Upload firmware
       uses: actions/upload-artifact@master
       if: always()
       with:
-        name: OpenWrt firmware
-        path: openwrt/bin/targets
+        name: OpenWrt_firmware
+        path: ${{ env.FIRMWARE }}
diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml
@@ -90,16 +90,23 @@ jobs:
         cd openwrt
         make -j1 V=s
 
-    - name : Upload packages
+    - name: Upload bin directory
       uses: actions/upload-artifact@master
       if: always()
       with:
-        name: OpenWrt packages
-        path: openwrt/bin/packages
+        name: OpenWrt_bin
+        path: openwrt/bin
 
-    - name : Upload targets
+    - name: Organize files
+      if: always()
+      run: |
+        cd openwrt/bin/targets/*/*
+        rm -rf packages
+        echo "::set-env name=FIRMWARE::$(pwd)"
+
+    - name: Upload firmware
       uses: actions/upload-artifact@master
       if: always()
       with:
-        name: OpenWrt firmware
-        path: openwrt/bin/targets
+        name: OpenWrt_firmware
+        path: ${{ env.FIRMWARE }}