From 2b924b4a055b81db4643bf3623c7b17aeec030b7 Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Sat, 14 Dec 2019 20:42:28 +0800 Subject: [PATCH 1/7] Create r1s.yml --- .github/workflows/r1s.yml | 124 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 .github/workflows/r1s.yml diff --git a/.github/workflows/r1s.yml b/.github/workflows/r1s.yml new file mode 100644 index 00000000..dd60912c --- /dev/null +++ b/.github/workflows/r1s.yml @@ -0,0 +1,124 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 Jolly +# +# +# +# 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/ +© 2019 GitHub, Inc. +Terms +Privacy +Security +Status +Help +Contact GitHub +Pricing +API +Training +Blog +About From 6243dcd28f92852dc9d808c650aa71cba91a8708 Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Sun, 15 Dec 2019 13:33:22 +0800 Subject: [PATCH 2/7] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 041db96f..6131016c 100644 --- a/README.md +++ b/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服务，你就可以关闭网页该干嘛干嘛，随时可以打开页面查看进度 下图是编译的结果页面： From 3b1e56b13b82022c3a3fc1cbffe9fe7069cf4cad Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Sun, 15 Dec 2019 14:02:26 +0800 Subject: [PATCH 3/7] Update r1s-h5-config --- r1s-h5-config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/r1s-h5-config b/r1s-h5-config index f338ad42..ee92caaf 100644 --- a/r1s-h5-config +++ b/r1s-h5-config @@ -3182,7 +3182,7 @@ CONFIG_PACKAGE_luci-app-advanced-reboot=y 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 +3199,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 +3222,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 From 077eb24b14f2622cd9f21af4ede2fe064424d32a Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Sun, 15 Dec 2019 14:05:12 +0800 Subject: [PATCH 4/7] Update OpenWrt-Build-Cli-H5.yml --- OpenWrt-Build-Cli-H5.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenWrt-Build-Cli-H5.yml b/OpenWrt-Build-Cli-H5.yml index 2324b230..471555e5 100644 --- a/OpenWrt-Build-Cli-H5.yml +++ b/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/xhjd5127/NanoPi-R1S-Build-By-Actions/master/r1s-h5-config cp r1s-h5-config .config - name: Download package From 29842f0945f9430221b00846aef98e9959434dd6 Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Sun, 15 Dec 2019 14:08:17 +0800 Subject: [PATCH 5/7] Update r1s.yml --- .github/workflows/r1s.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/r1s.yml b/.github/workflows/r1s.yml index dd60912c..2324b230 100644 --- a/.github/workflows/r1s.yml +++ b/.github/workflows/r1s.yml @@ -110,15 +110,3 @@ jobs: with: name: FriendlyWrt_NanoPi-R1S path: ./artifact/ -© 2019 GitHub, Inc. -Terms -Privacy -Security -Status -Help -Contact GitHub -Pricing -API -Training -Blog -About From c33719618554df6b7b3a12367d59b0aac4333393 Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Sun, 15 Dec 2019 18:34:07 +0800 Subject: [PATCH 6/7] Update r1s-h5-config add docker adguardhome --- r1s-h5-config | 1 + 1 file changed, 1 insertion(+) diff --git a/r1s-h5-config b/r1s-h5-config index ee92caaf..0136161b 100644 --- a/r1s-h5-config +++ b/r1s-h5-config @@ -3175,6 +3175,7 @@ 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 From 6065d5c3b46b60a4fa0e2e66775bfd428fb5a857 Mon Sep 17 00:00:00 2001 From: xhjd5127 <425406803@qq.com> Date: Thu, 9 Jan 2020 14:58:44 +0800 Subject: [PATCH 7/7] Update OpenWrt-Build-Cli-H5.yml https://raw.githubusercontent.com/ulpyuxa/NanoPi-R1S-Build-By-Actions/master/r1s-h5-config --- OpenWrt-Build-Cli-H5.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenWrt-Build-Cli-H5.yml b/OpenWrt-Build-Cli-H5.yml index 471555e5..231450c0 100644 --- a/OpenWrt-Build-Cli-H5.yml +++ b/OpenWrt-Build-Cli-H5.yml @@ -80,7 +80,7 @@ jobs: run: | cd friendlywrt-h5/friendlywrt rm -f ./.config* - wget https://raw.githubusercontent.com/xhjd5127/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