Update v19.yml

.github/workflows/v19.yml

@@ -24,9 +24,16 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
+          sudo apt-get update
+          sudo apt-get install bc -y
           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: |
+          git clone https://github.com/friendlyarm/repo
+          sudo cp repo/repo /usr/bin/
+          
       - name: Download Source
         run: |
           mkdir friendlywrt-h5
@@ -36,68 +43,19 @@ jobs:
       - name: Merge UpStearm OpenWrt
         run: |
           cd friendlywrt-h5
-          rm .repo/manifests/h5.xml
+          rm -f .repo/manifests/h5.xml
           cp ../h5-19.07.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
-          #echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default
-      
       - name: Update Target.mk
         run: |
-          cd friendlywrt-h5/friendlywrt/include
+          cd friendlywrt-h5/
-          sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk
+          sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk
                     
-      - name: Custom Configure File
+      - name: Update Feeds
         run: |
-          cd friendlywrt-h5
+          cd friendlywrt-h5/friendlywrt
-          rm -f friendlywrt/.config*
+          ./scripts/feeds clean -a
-          cat > ./configs/config_h5 <<EOF
-          CONFIG_TARGET_sunxi=y
-          CONFIG_TARGET_sunxi_cortexa53=y
-          CONFIG_TARGET_sunxi_cortexa53_DEVICE_sun50i-h5-nanopi-neo-plus2=y
-          CONFIG_TARGET_PER_DEVICE_ROOTFS=y
-          CONFIG_IB=y
-          CONFIG_IMAGEOPT=y
-
-          CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
-          CONFIG_PACKAGE_ipv6helper=y
-          CONFIG_PACKAGE_luci-app-adbyby-plus=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
-          EOF
-          cat ./configs/config_h5
                     
       - name: Build FriendlyWrt
         run: |
@@ -106,14 +64,11 @@ 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