From e9a219c157934f29924b425df06360e1c9f925f1 Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Thu, 23 Jan 2020 14:20:52 +0800
Subject: [PATCH] Update main.yml

---
 .github/workflows/main.yml | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf4a049..c65a93c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,49 +37,30 @@ jobs:
           mkdir friendlywrt-h5
           cd friendlywrt-h5
           repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo  --no-clone-bundle
-      
+          
       - name: Merge UpStearm OpenWrt
         run: |
           cd friendlywrt-h5
-          cd .repo/manifests
-          rm -f ./h5.xml
-          wget https://raw.githubusercontent.com/camino13/NanoPi-R1S/master/h5.xml
+          rm -f .repo/manifests/h5.xml
+          cp ../original.xml .repo/manifests/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/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default
-          sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default
-      
       - name: Update Target.mk
         run: |
-          cd friendlywrt-h5/friendlywrt/include 
-          sed -i 's/dnsmasq /dnsmasq-full default-settings luci/' target.mk    
-          
+          cd friendlywrt-h5/
+          sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk
+                    
       - name: Update Feeds
         run: |
           cd friendlywrt-h5/friendlywrt
           ./scripts/feeds update -a
           ./scripts/feeds install -a
-          
-      - name: Custom Configure File
-        run: |
-          cd friendlywrt-h5/friendlywrt
-          rm -f ./.config*
-          wget https://raw.githubusercontent.com/camino13/NanoPi-R1S/master/r1s-h5-config
-          cp r1s-h5-config .config
       
       - name: Download package
         if: always()
         run: |
           cd friendlywrt-h5/friendlywrt
           make download -j8
-          find dl -size -1024c -exec ls -l {} \;
-          find dl -size -1024c -exec rm -f {} \;
           
       - name: Build FriendlyWrt
         run: |