From b22cd511d953ea60fbdc35b8e2aada4f3f8d2844 Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Mon, 20 Jan 2020 06:01:21 +0800
Subject: [PATCH] Update and rename main.yml to master.yml

---
 .github/workflows/{main.yml => master.yml} | 53 ++--------------------
 1 file changed, 4 insertions(+), 49 deletions(-)
 rename .github/workflows/{main.yml => master.yml} (55%)

diff --git a/.github/workflows/main.yml b/.github/workflows/master.yml
similarity index 55%
rename from .github/workflows/main.yml
rename to .github/workflows/master.yml
index 01db0cd..d61885f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/master.yml
@@ -5,9 +5,7 @@ name: NanoPi-R1S H5 FriendlyWrt(master+lean's feed) Build
 on:
   push:
     paths:
-      - '.github/workflows/main.yml'
-  schedule:
-      - cron: 0 8 * * 5
+      - '.github/workflows/master.yml'
   # release:
   #   types: [published]
 
@@ -40,9 +38,8 @@ jobs:
       - name: Merge UpStearm OpenWrt
         run: |
           cd friendlywrt-h5
-          cd .repo/manifests
-          rm -f ./h5.xml
-          wget https://raw.githubusercontent.com/klever1988/NanoPi-R1S/master/h5.xml
+          rm .repo/manifests/h5.xml
+          cp ../h5.xml .repo/manifests/h5.xml
           repo sync -c  --no-clone-bundle
 
       - name: Merge LEDE
@@ -64,49 +61,7 @@ jobs:
         run: |
           cd friendlywrt-h5
           rm -f friendlywrt/.config*
-          sed -i '/docker/d;/DOCKER/d' ./configs/config_h5
-          cat >> ./configs/config_h5 <<EOF	
-          	
-          CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y	
-          CONFIG_PACKAGE_ipv6helper=y	
-          CONFIG_PACKAGE_luci-app-adbyby-plus=y	
-          CONFIG_PACKAGE_luci-app-samba4=y	
-          CONFIG_PACKAGE_luci-app-statistics=y	
-          CONFIG_PACKAGE_luci-app-unblockmusic=y	
-          CONFIG_PACKAGE_luci-app-vnstat=y
-          CONFIG_PACKAGE_luci-app-ssr-plus=y
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y	
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Server=y	
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Socks=y	
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray=y	
-          CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Trojan=y
-          CONFIG_PACKAGE_luci-app-ttyd=y	
-          CONFIG_PACKAGE_luci-app-wrtbwmon=y	
-          CONFIG_PACKAGE_luci-app-netdata=y	
-          CONFIG_PACKAGE_luci-theme-argon=y	
-          CONFIG_PACKAGE_luci-theme-netgear=y	
-          CONFIG_PACKAGE_luci-theme-rosy=y	
-          CONFIG_PACKAGE_curl=y	
-          CONFIG_PACKAGE_htop=y	
-          CONFIG_PACKAGE_nano=y	
-          CONFIG_PACKAGE_screen=y	
-          CONFIG_PACKAGE_tree=y	
-          CONFIG_PACKAGE_vim-fuller=y	
-          CONFIG_PACKAGE_wget=y	
-          CONFIG_PACKAGE_collectd-mod-ping=y	
-          CONFIG_PACKAGE_collectd-mod-thermal=y	
-          CONFIG_PACKAGE_collectd-mod-cpufreq=y	
-          # CONFIG_FEED_rosy is not set	
-          # CONFIG_ALL_KMODS is not set	
-          # CONFIG_ALL_NONSHARED is not set	
-          # CONFIG_DEVEL is not set	
-          # CONFIG_PACKAGE_luci-lib-iptparser is not set	
-          # CONFIG_PACKAGE_luci-app-samba is not set	
-          # CONFIG_PACKAGE_samba36-server is not set	
-          # CONFIG_DISPLAY_SUPPORT is not set	
-          	
-          EOF
-          cat ./configs/config_h5
+          cp ../config.seed ./configs/config_h5
           
       - name: Build FriendlyWrt
         run: |