更新数据

.github/workflows/r1s.yml

@@ -0,0 +1,112 @@
+#
+# This is free software, lisence use MIT.
+# 
+# Copyright (C) 2019 Jolly <https://totoro.site>
+# 
+# <https://github.com/skytotwo/NanoPi-R1S-Build-By-Actions>
+#
+# Write by Jolly 2019/12/7
+# last update at 2019/12/14
+
+name: NanoPi-R1s H5 OpenWrt Build
+
+on:
+  push:
+    branches: 
+      - master
+  # schedule:
+  #   - cron: 0 20 * * *
+  # release:
+  #   types: [published]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          ref: master
+
+      - name: Initialization Environment
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash         
+
+      - name: Install Repo
+        run: |
+          git clone https://github.com/friendlyarm/repo
+          sudo cp repo/repo /usr/bin/
+
+      - name: Download Source
+        run: |
+          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/skytotwo/transferUtils/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-18.06/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default  
+
+      - name: Update Target.mk
+        run: |
+          cd friendlywrt-h5/friendlywrt/include 
+          sed -i 's/dnsmasq /dnsmasq-full default-settings luci/' target.mk    
+
+      - name: Update Feeds
+        run: |
+          cd friendlywrt-h5/friendlywrt
+          ./scripts/feeds update -a
+          ./scripts/feeds install -a
+
+      - name: Costom Configure File
+        run: |
+          cd friendlywrt-h5/friendlywrt
+          rm -f ./.config*
+          wget https://raw.githubusercontent.com/skytotwo/NanoPi-R1S-Build-By-Actions/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 OpenWrt
+        run: |
+          cd friendlywrt-h5
+          ./build.sh nanopi_r1s.mk
+
+      - name: Zip Files
+        run: |
+          find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {}
+
+      - name: Assemble Artifact
+        run: |
+          rm -rf ./artifact/
+          mkdir -p ./artifact/
+          find friendlywrt-h5/out/ -name "FriendlyWrt_*img.zip*" | xargs -i mv -f {} ./artifact/
+      - name: Upload Artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: FriendlyWrt_NanoPi-R1S
+          path: ./artifact/

OpenWrt-Build-Cli-H5.yml

@@ -80,7 +80,7 @@ jobs:
         run: |
           cd friendlywrt-h5/friendlywrt
           rm -f ./.config*
-          wget https://raw.githubusercontent.com/skytotwo/NanoPi-R1S-Build-By-Actions/master/r1s-h5-config
+          wget https://raw.githubusercontent.com/ulpyuxa/NanoPi-R1S-Build-By-Actions/master/r1s-h5-config
           cp r1s-h5-config .config
 
       - name: Download package

README.md

@@ -1,3 +1,6 @@
+
+感谢skytotwo
+
 # 使用Github的Actions功能在线编译NanoPi-R1S固件（包含H5和H3）
 之前我们要编译OpenWrt固件，就需要自己准备好虚拟机，或者租好服务器，准备好梯子，编译一次耗时4,5个小时都有，很费力劳神。实际上像这种编译的操作完全可以放在Github上来执行，最近入手了NanoPi-R1s H5，自己也用传统方式编译了几个固件，但也想着能否尝试更方便的编译。随后，便尝试编写了NanoPi-R1s的Actions的YML执行文件，自己尝试了下，编译很成功，整个过程就是“简单，顺畅”，一共耗时大概2小时，一旦启动了Actions服务，你就可以关闭网页该干嘛干嘛，随时可以打开页面查看进度
 下图是编译的结果页面：

r1s-h5-config

@@ -3175,14 +3175,15 @@ CONFIG_PACKAGE_luci-app-accesscontrol=y
 # CONFIG_PACKAGE_luci-app-acme is not set
 # CONFIG_PACKAGE_luci-app-adblock is not set
 CONFIG_PACKAGE_luci-app-adbyby-plus=y
+CONFIG_PACKAGE_luci-app-adguardhome-y
 CONFIG_PACKAGE_luci-app-advanced-reboot=y
 # CONFIG_PACKAGE_luci-app-ahcp is not set
 # CONFIG_PACKAGE_luci-app-amule is not set
 # CONFIG_PACKAGE_luci-app-aria2 is not set
 CONFIG_PACKAGE_luci-app-arpbind=y
 # CONFIG_PACKAGE_luci-app-asterisk is not set
 # CONFIG_PACKAGE_luci-app-attendedsysupgrade is not set
-# CONFIG_PACKAGE_luci-app-autoreboot is not set
+CONFIG_PACKAGE_luci-app-autoreboot=y
 # CONFIG_PACKAGE_luci-app-baidupcs-web is not set
 # CONFIG_PACKAGE_luci-app-bcp38 is not set
 # CONFIG_PACKAGE_luci-app-bird4 is not set
@@ -3199,7 +3200,7 @@ CONFIG_PACKAGE_luci-app-ddns=y
 # CONFIG_PACKAGE_luci-app-dnscrypt-proxy is not set
 # CONFIG_PACKAGE_luci-app-dnsforwarder is not set
 # CONFIG_PACKAGE_luci-app-dnspod is not set
-# CONFIG_PACKAGE_luci-app-docker is not set
+CONFIG_PACKAGE_luci-app-docker=y
 # CONFIG_PACKAGE_luci-app-dump1090 is not set
 # CONFIG_PACKAGE_luci-app-dynapoint is not set
 # CONFIG_PACKAGE_luci-app-e2guardian is not set
@@ -3222,7 +3223,7 @@ CONFIG_PACKAGE_luci-app-ipsec-vpnd=y
 # CONFIG_PACKAGE_luci-app-meshwizard is not set
 # CONFIG_PACKAGE_luci-app-minidlna is not set
 # CONFIG_PACKAGE_luci-app-mjpg-streamer is not set
-# CONFIG_PACKAGE_luci-app-mtwifi is not set
+CONFIG_PACKAGE_luci-app-mtwifi=y
 CONFIG_PACKAGE_luci-app-mwan3=y
 # CONFIG_PACKAGE_luci-app-mwan3helper is not set
 # CONFIG_PACKAGE_luci-app-n2n_v2 is not set