From d11d3107f9895998db29a2ca787e3ce3022dc299 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Thu, 5 Mar 2020 22:33:41 +0800 Subject: [PATCH 1/8] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 8bd5448c4..bdb8662fd 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-CI +name: OpenWrt18.06-加强版 on: push: branches: @@ -117,10 +117,10 @@ jobs: CONFIG_EFI_IMAGES=y EOF # IPv6支持: - # cat >> .config <> .config <> .config <> .config < Date: Thu, 5 Mar 2020 22:37:41 +0800 Subject: [PATCH 2/8] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index bdb8662fd..a24f8a3d4 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -13,7 +13,7 @@ on: branches: - master # schedule: - # - cron: 0 20 * * * + # - cron: 1 20 * * * # release: # types: [published] From 71011bf3971f49c13c3981d5b6f31bc506902d96 Mon Sep 17 00:00:00 2001 From: yk0800 Date: Fri, 6 Mar 2020 00:44:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?Create=20=E8=87=AA=E7=BC=96=E8=AF=91OpenWrt?= =?UTF-8?q?18.06-CI-=E5=8A=A0=E5=BC=BA=E7=89=88.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-\345\212\240\345\274\272\347\211\210.yml" | 287 ++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 ".github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" diff --git "a/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" "b/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" new file mode 100644 index 000000000..c0b4ad1dd --- /dev/null +++ "b/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" @@ -0,0 +1,287 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 P3TERX +# Copyright (C) 2019 KFERMercer +# +# +# + +name: OpenWrt-加强版 +on: + push: + branches: + - master + # schedule: + # - cron: 1 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/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 + # ==========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: Fri, 6 Mar 2020 14:20:42 +0800 Subject: [PATCH 4/8] 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..8749ed5aa 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 350 help Select the root filesystem partition size. From 1a17385d14cbf8405b985ac8be03678d7fe90506 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Fri, 6 Mar 2020 14:24:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?Update=20=E8=87=AA=E7=BC=96=E8=AF=91OpenWrt?= =?UTF-8?q?18.06-CI-=E5=8A=A0=E5=BC=BA=E7=89=88.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" "b/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" index c0b4ad1dd..3e4a95dcb 100644 --- "a/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" +++ "b/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.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 From f006114acfccf3a454d75239048a6256d1978c34 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Fri, 6 Mar 2020 14:26:33 +0800 Subject: [PATCH 6/8] Update target.mk --- include/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/target.mk b/include/target.mk index bde13664d..e46f3391a 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd block-mount coremark \ kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \ -default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ +default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot luci-app-ssr-plus \ luci-app-filetransfer luci-app-vsftpd ddns-scripts_aliyun luci-app-koolproxyR \ luci-app-arpbind luci-app-vlmcsd luci-app-wifischedule luci-app-wol luci-app-ramfree \ luci-app-qos-gargoyle libericstools libmbedtls kmod-ipt-tproxy iptables-mod-ipopt wget unzip resolveip luci-lib-jsonc kmod-ipt-ipopt gargoyle-firewall-util libiptbwctl qos-gargoyle kmod-ipt-ndpi kmod-ipt-webmon \ From 07ca25193f8d5d221dfb21025b63285fc16a0008 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Fri, 6 Mar 2020 17:19:08 +0800 Subject: [PATCH 7/8] Update target.mk --- include/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/target.mk b/include/target.mk index e46f3391a..bde13664d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd block-mount coremark \ kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \ -default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot luci-app-ssr-plus \ +default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-vsftpd ddns-scripts_aliyun luci-app-koolproxyR \ luci-app-arpbind luci-app-vlmcsd luci-app-wifischedule luci-app-wol luci-app-ramfree \ luci-app-qos-gargoyle libericstools libmbedtls kmod-ipt-tproxy iptables-mod-ipopt wget unzip resolveip luci-lib-jsonc kmod-ipt-ipopt gargoyle-firewall-util libiptbwctl qos-gargoyle kmod-ipt-ndpi kmod-ipt-webmon \ From 23927d32433bac8ca9b757244cd9f63720f242d2 Mon Sep 17 00:00:00 2001 From: yk0800 <61594016+yk0800@users.noreply.github.com> Date: Fri, 6 Mar 2020 17:24:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?Update=20=E8=87=AA=E7=BC=96=E8=AF=91OpenWrt?= =?UTF-8?q?18.06-CI-=E5=8A=A0=E5=BC=BA=E7=89=88.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" "b/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" index 3e4a95dcb..64fa80393 100644 --- "a/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" +++ "b/.github/workflows/\350\207\252\347\274\226\350\257\221OpenWrt18.06-CI-\345\212\240\345\274\272\347\211\210.yml" @@ -7,7 +7,7 @@ # # -name: OpenWrt-加强版 +name: OpenWrt-Lean加强版 on: push: branches: