From 61863b3bd8a676ee2d53905aca0c6a3999ad5364 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Wed, 4 Mar 2020 23:17:16 +0800 Subject: [PATCH 01/11] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 157a40587..3ec1687b8 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -60,7 +60,7 @@ jobs: tar xvJf luci-app-nps.tar.xz git clone https://github.com/Sweet-Fairy/openwrt-package git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo - git clone -b lean https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean + git clone -b lean https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean git clone https://github.com/Leo-Jo-My/luci-app-vssr git clone https://github.com/lisaac/luci-lib-docker.git package/luci-lib-docker git clone https://github.com/lisaac/luci-app-dockerman.git package/luci-app-dockerman @@ -117,10 +117,10 @@ jobs: CONFIG_EFI_IMAGES=y EOF # IPv6支持: - # cat >> .config <> .config <> .config <> .config < Date: Wed, 4 Mar 2020 23:21:11 +0800 Subject: [PATCH 02/11] Update Config-images.in --- config/Config-images.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Config-images.in b/config/Config-images.in index 09a055913..05956e08f 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -302,7 +302,7 @@ menu "Target Images" config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MB)" depends on GRUB_IMAGES || EFI_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_rb532 || TARGET_sunxi || TARGET_uml - default 380 + default 400 help Select the root filesystem partition size. From 5501222842b07320710b64e2ef44a7e5d6aea954 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 04:39:37 +0800 Subject: [PATCH 03/11] Update Config-images.in --- config/Config-images.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Config-images.in b/config/Config-images.in index 05956e08f..1f9146158 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -302,7 +302,7 @@ menu "Target Images" config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MB)" depends on GRUB_IMAGES || EFI_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_rb532 || TARGET_sunxi || TARGET_uml - default 400 + default 300 help Select the root filesystem partition size. From e85272b1ffd80de19ece3427bf5c9ee85676c2da Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 04:58:31 +0800 Subject: [PATCH 04/11] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 3ec1687b8..090dd030f 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -60,7 +60,7 @@ jobs: tar xvJf luci-app-nps.tar.xz git clone https://github.com/Sweet-Fairy/openwrt-package git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo - git clone -b lean https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean + git clone https://github.com/coolsnowwolf/lede/tree/master/package/lean git clone https://github.com/Leo-Jo-My/luci-app-vssr git clone https://github.com/lisaac/luci-lib-docker.git package/luci-lib-docker git clone https://github.com/lisaac/luci-app-dockerman.git package/luci-app-dockerman @@ -190,7 +190,7 @@ jobs: CONFIG_PACKAGE_kmod-tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y # CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y - CONFIG_PACKAGE_luci-app-ssr-plus-lean=y + CONFIG_PACKAGE_luci-app-ssr-plus=y CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-amule=y CONFIG_PACKAGE_luci-app-oaf=y From 404a5134a06ca510b13b3dee8e61c403dd485254 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 05:49:56 +0800 Subject: [PATCH 05/11] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 090dd030f..1f3439976 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -60,7 +60,7 @@ jobs: tar xvJf luci-app-nps.tar.xz git clone https://github.com/Sweet-Fairy/openwrt-package git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo - git clone https://github.com/coolsnowwolf/lede/tree/master/package/lean + git clone -b lean https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean git clone https://github.com/Leo-Jo-My/luci-app-vssr git clone https://github.com/lisaac/luci-lib-docker.git package/luci-lib-docker git clone https://github.com/lisaac/luci-app-dockerman.git package/luci-app-dockerman @@ -178,6 +178,7 @@ jobs: CONFIG_PACKAGE_luci-app-nps=y CONFIG_PACKAGE_luci-app-cpulimit=y CONFIG_PACKAGE_luci-app-netdata=y + CONFIG_PACKAGE_luci-i18n-netdata-zh-cn=y CONFIG_PACKAGE_luci-app-cupsd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-qos=y @@ -190,7 +191,7 @@ jobs: CONFIG_PACKAGE_kmod-tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y # CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y - CONFIG_PACKAGE_luci-app-ssr-plus=y + CONFIG_PACKAGE_luci-app-ssr-plus-lean=y CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-amule=y CONFIG_PACKAGE_luci-app-oaf=y From 52b91e3d02cf8e693be1a1186bac215d1cebb4f7 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 07:26:50 +0800 Subject: [PATCH 06/11] Create ZBY.yml --- .github/workflows/ZBY.yml | 285 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 285 insertions(+) create mode 100644 .github/workflows/ZBY.yml diff --git a/.github/workflows/ZBY.yml b/.github/workflows/ZBY.yml new file mode 100644 index 000000000..ea7a33d1c --- /dev/null +++ b/.github/workflows/ZBY.yml @@ -0,0 +1,285 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 P3TERX +# Copyright (C) 2019 KFERMercer +# +# +# + +name: OpenWrt18.06-自编译 +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: Space cleanup + env: + DEBIAN_FRONTEND: noninteractive + run: | + docker rmi `docker images -q` + sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d + sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* mysql* php* + sudo -E apt-get update + sudo -E apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler + sudo -E apt-get -y autoremove --purge + sudo -E apt-get clean + # sudo mkdir -p -m 777 /mnt/openwrt/bin /mnt/openwrt/build_dir/host /mnt/openwrt/build_dir/hostpkg /mnt/openwrt/dl /mnt/openwrt/feeds /mnt/openwrt/staging_dir + # ln -s /mnt/openwrt/bin ./bin + # mkdir -p ./build_dir/host && ln -s /mnt/openwrt/build_dir/host ./build_dir/host + # mkdir -p ./build_dir/host && ln -s /mnt/openwrt/build_dir/hostpkg ./build_dir/hostpkg + # ln -s /mnt/openwrt/dl ./dl + # ln -s /mnt/openwrt/feeds ./feeds + # ln -s /mnt/openwrt/staging_dir ./staging_dir + df -h + - name: 自定义插件 + run: | + rm -rfv package/lean/autocore + cd package/diy + tar xvJf luci-app-docker.tar.xz + tar xvJf luci-app-koolddns.tar.xz + tar xvJf luci-app-rclone.tar.xz + tar xvJf autocore.tar.xz + tar xvJf luci-app-nps.tar.xz + git clone https://github.com/Sweet-Fairy/openwrt-package + git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo + git clone -b lean https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean + git clone https://github.com/Leo-Jo-My/luci-app-vssr + git clone https://github.com/lisaac/luci-lib-docker.git package/luci-lib-docker + git clone https://github.com/lisaac/luci-app-dockerman.git package/luci-app-dockerman + # ==========ssr-plus-Jo ssr-plus-lean不要一起编译 +vssr ========== + # ==========以上是示范如何加入tar.xz解包和拉github源码编译========== + - name: Update feeds + run: | + ./scripts/feeds update -a + ./scripts/feeds install -a + - name: Generate configuration file + run: | + rm -f ./.config* + touch ./.config + # + # ========================固件定制部分======================= + # + # + # 如果不对本区块做出任何编辑, 则生成默认配置固件. + # + # 以下为定制化固件选项和说明: + # + # + # 有些插件/选项是默认开启的, 如果想要关闭, 请参照以下示例进行编写: + # + # ========================================= + # | # 取消编译VMware镜像: | + # | cat >> .config <> .config <> .config <> .config <> .config <> .config <> .config <> .config <> .config <> .config <> .config < Date: Thu, 5 Mar 2020 10:26:34 +0800 Subject: [PATCH 07/11] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 1f3439976..6c6517758 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -178,7 +178,6 @@ jobs: CONFIG_PACKAGE_luci-app-nps=y CONFIG_PACKAGE_luci-app-cpulimit=y CONFIG_PACKAGE_luci-app-netdata=y - CONFIG_PACKAGE_luci-i18n-netdata-zh-cn=y CONFIG_PACKAGE_luci-app-cupsd=y CONFIG_PACKAGE_luci-app-unblockmusic=y CONFIG_PACKAGE_luci-app-qos=y From 9d91d62d1b9a1d919e5625815cf08c4973c7b3f4 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 10:29:48 +0800 Subject: [PATCH 08/11] Update ZBY.yml --- .github/workflows/ZBY.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ZBY.yml b/.github/workflows/ZBY.yml index ea7a33d1c..df1bdeb53 100644 --- a/.github/workflows/ZBY.yml +++ b/.github/workflows/ZBY.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-自编译 +name: OpenWrt18.06-ZBY on: push: branches: @@ -60,7 +60,7 @@ jobs: tar xvJf luci-app-nps.tar.xz git clone https://github.com/Sweet-Fairy/openwrt-package git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo - git clone -b lean https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean + git clone -b lean https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-lean git clone https://github.com/Leo-Jo-My/luci-app-vssr git clone https://github.com/lisaac/luci-lib-docker.git package/luci-lib-docker git clone https://github.com/lisaac/luci-app-dockerman.git package/luci-app-dockerman @@ -190,8 +190,8 @@ jobs: # CONFIG_PACKAGE_kmod-tcp-bbr-mod=y CONFIG_PACKAGE_kmod-tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y - CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y - # CONFIG_PACKAGE_luci-app-ssr-plus-lean=y + # CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y + CONFIG_PACKAGE_luci-app-ssr-plus-lean=y CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-amule=y CONFIG_PACKAGE_luci-app-oaf=y From cf18f34c9a4230c96c3995c3fc3aec13de82364b Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 16:54:43 +0800 Subject: [PATCH 09/11] Update ZBY.yml --- .github/workflows/ZBY.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ZBY.yml b/.github/workflows/ZBY.yml index df1bdeb53..48077a29e 100644 --- a/.github/workflows/ZBY.yml +++ b/.github/workflows/ZBY.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-ZBY +name: OpenWrt18.06-自编 on: push: branches: @@ -190,8 +190,8 @@ jobs: # CONFIG_PACKAGE_kmod-tcp-bbr-mod=y CONFIG_PACKAGE_kmod-tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y - # CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y - CONFIG_PACKAGE_luci-app-ssr-plus-lean=y + CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y + # CONFIG_PACKAGE_luci-app-ssr-plus-lean=y CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-amule=y CONFIG_PACKAGE_luci-app-oaf=y From cc136e03c4b7863e953833f5ac0dafb404f60236 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 18:42:21 +0800 Subject: [PATCH 10/11] Update ZBY.yml --- .github/workflows/ZBY.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ZBY.yml b/.github/workflows/ZBY.yml index 48077a29e..74012b677 100644 --- a/.github/workflows/ZBY.yml +++ b/.github/workflows/ZBY.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-自编 +name: OpenWrt18.06-自by on: push: branches: From 82ef329cafedc905c62e4be6c76941e5aa3a77ce Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 22:26:22 +0800 Subject: [PATCH 11/11] Update ZBY.yml --- .github/workflows/ZBY.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ZBY.yml b/.github/workflows/ZBY.yml index 74012b677..6f3c0fc65 100644 --- a/.github/workflows/ZBY.yml +++ b/.github/workflows/ZBY.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-自by +name: OpenWrt18.06-自编译 on: push: branches: