Update main.yml

.github/workflows/main.yml

@@ -25,6 +25,7 @@ jobs:
         run: |
           sudo apt-get update
           wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk
           
       - name: Install Repo
         run: |
@@ -44,18 +45,15 @@ jobs:
           rm -f ./h5.xml
           wget https://raw.githubusercontent.com/camino13/NanoPi-R1S/master/h5.xml
           repo sync -c  --no-clone-bundle
+          
       - name: Merge LEDE
         run: |
           cd friendlywrt-h5
           git clone https://github.com/coolsnowwolf/lede
           cd friendlywrt
           cp -r ../lede/package/lean package/         
-          sed -i 's/https:\/\/git.openwrt.org\/project\/luci.git;openwrt-19.07/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default
+          sed -i 's/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default
-          sed -i 's/https:\/\/git.openwrt.org\/feed\/packages.git;openwrt-19.07/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default
+          sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default
-      - name: Custom Applications
-        run: |
-          cd friendlywrt-h5/friendlywrt/package
-          git clone https://github.com/Baozisoftware/luci-app-koolproxy
       
       - name: Update Target.mk
         run: |
@@ -90,13 +88,13 @@ jobs:
       
       - name: Zip Files
         run: |
-          find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {}
+          gzip friendlywrt-h5/out/*.img
-          
       - name: Assemble Artifact
         run: |
           rm -rf ./artifact/
           mkdir -p ./artifact/
-          find friendlywrt-h5/out/ -name "FriendlyWrt_*img.zip*" | xargs -i mv -f {} ./artifact/
+          mv friendlywrt-h5/out/*img* ./artifact/
+          cp friendlywrt-h5/friendlywrt/.config ./artifact/
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         with: