From 362e0e7e1d1d8f4f3c1ddf07d26e937b2d6ca4c8 Mon Sep 17 00:00:00 2001 From: zh610902551 <610902551@qq.com> Date: Mon, 24 Feb 2020 23:00:28 +0800 Subject: [PATCH 01/14] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index fa57a0408..b4c5b8e58 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -138,9 +138,17 @@ jobs: CONFIG_PACKAGE_kmod-usb2-pci=y CONFIG_PACKAGE_kmod-usb3=y EOF + # 网卡支持: + cat >> .config <> .config < Date: Thu, 27 Feb 2020 15:48:09 +0800 Subject: [PATCH 02/14] build: add urandom-seed and urngd to default packages set --- include/target.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/target.mk b/include/target.mk index c626f92d1..bde13664d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -18,12 +18,12 @@ kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl c 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 gargoyle-firewall-util libiptbwctl qos-gargoyle kmod-ipt-ndpi kmod-ipt-webmon \ +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 \ luci-app-sfe luci-app-flowoffload luci-app-nlbwmon luci-app-xlnetacc # For nas targets DEFAULT_PACKAGES.nas:=fdisk lsblk mdadm automount autosamba luci-app-usb-printer # For router targets -DEFAULT_PACKAGES.router:=dnsmasq-full iptables ppp ppp-mod-pppoe firewall kmod-ipt-offload kmod-tcp-bbr +DEFAULT_PACKAGES.router:=dnsmasq-full iptables ppp ip ipset ppp-mod-pppoe firewall kmod-ipt-offload kmod-tcp-bbr DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) From 9d0724293ba90407c510d4b360626f624c67cfd1 Mon Sep 17 00:00:00 2001 From: zh610902551 <610902551@qq.com> Date: Thu, 27 Feb 2020 17:11:00 +0800 Subject: [PATCH 03/14] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index b4c5b8e58..c12bbaed9 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -144,7 +144,8 @@ jobs: CONFIG_PACKAGE_kmod-atl1=y CONFIG_PACKAGE_kmod-atl1c=y CONFIG_PACKAGE_kmod-atl1e=y - CONFIG_PACKAGE_kmod-atl2=y + CONFIG_PACKAGE_kmod-rtl8180=y + CONFIG_PACKAGE_kmod-rtl8187=y EOF # 常用LuCI插件选择: cat >> .config <> .config < Date: Fri, 28 Feb 2020 17:35:57 +0800 Subject: [PATCH 04/14] Update openwrt18.06.yml Add luci-app-ssr-plus-Jo luci-app-passwall --- .github/workflows/openwrt18.06.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index c12bbaed9..c75f71b2d 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -62,6 +62,8 @@ jobs: 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 + git clone https://github.com/hong0980/luci-app-passwall.git package/luci-app-passwall + git clone https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-Jo cd ../.. rm -rfv package/lean/autocore @@ -190,11 +192,13 @@ jobs: CONFIG_PACKAGE_luci-app-advancedsetting=y CONFIG_PACKAGE_luci-app-clash=y CONFIG_PACKAGE_luci-app-qosv4=y - CONFIG_PACKAGE_luci-app-samba=y - CONFIG_PACKAGE_luci-app-smartdns=y + CONFIG_PACKAGE_luci-app-samba=y + CONFIG_PACKAGE_luci-app-smartdns=y # CONFIG_PACKAGE_tcp-bbr-mod=y CONFIG_PACKAGE_tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y + CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y + CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-amule=y CONFIG_PACKAGE_luci-app-oaf=y @@ -225,9 +229,9 @@ jobs: # CONFIG_PACKAGE_luci-app-speederv2=y CONFIG_PACKAGE_luci-app-ssr-libev-server=y CONFIG_PACKAGE_luci-app-ssr-python-pro-server=y - CONFIG_PACKAGE_luci-app-transmission=y - CONFIG_LUCI_LANG_en=y - CONFIG_LUCI_LANG_zh-tw=y + CONFIG_PACKAGE_luci-app-transmission=y + CONFIG_LUCI_LANG_en=y + CONFIG_LUCI_LANG_zh-tw=y EOF # LuCI主题: cat >> .config < Date: Fri, 28 Feb 2020 23:06:20 +0800 Subject: [PATCH 05/14] 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 c75f71b2d..77ca0c894 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -230,8 +230,8 @@ jobs: CONFIG_PACKAGE_luci-app-ssr-libev-server=y CONFIG_PACKAGE_luci-app-ssr-python-pro-server=y CONFIG_PACKAGE_luci-app-transmission=y - CONFIG_LUCI_LANG_en=y - CONFIG_LUCI_LANG_zh-tw=y + CONFIG_LUCI_LANG_en=y + CONFIG_LUCI_LANG_zh-tw=y EOF # LuCI主题: cat >> .config < Date: Fri, 28 Feb 2020 23:44:37 +0800 Subject: [PATCH 06/14] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 77ca0c894..494e45792 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -192,8 +192,6 @@ jobs: CONFIG_PACKAGE_luci-app-advancedsetting=y CONFIG_PACKAGE_luci-app-clash=y CONFIG_PACKAGE_luci-app-qosv4=y - CONFIG_PACKAGE_luci-app-samba=y - CONFIG_PACKAGE_luci-app-smartdns=y # CONFIG_PACKAGE_tcp-bbr-mod=y CONFIG_PACKAGE_tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y From 4aefbb0765643a11a094555af10bd0e4c3a39da8 Mon Sep 17 00:00:00 2001 From: zh610902551 <610902551@qq.com> Date: Sat, 29 Feb 2020 00:53:12 +0800 Subject: [PATCH 07/14] Create openwrt18.06-ssr+.yml --- .github/workflows/openwrt18.06-ssr+.yml | 291 ++++++++++++++++++++++++ 1 file changed, 291 insertions(+) create mode 100644 .github/workflows/openwrt18.06-ssr+.yml diff --git a/.github/workflows/openwrt18.06-ssr+.yml b/.github/workflows/openwrt18.06-ssr+.yml new file mode 100644 index 000000000..fd071ff9f --- /dev/null +++ b/.github/workflows/openwrt18.06-ssr+.yml @@ -0,0 +1,291 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 P3TERX +# Copyright (C) 2019 KFERMercer +# +# +# + +name: OpenWrt18.06-CI +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: | + 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/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 + git clone https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-Jo + cd ../.. + rm -rfv package/lean/autocore + + # ==========以上是示范如何加入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 <> .config < Date: Sat, 29 Feb 2020 01:02:02 +0800 Subject: [PATCH 08/14] Create MT7620.yml hc5661 --- .github/workflows/MT7620.yml | 198 +++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 .github/workflows/MT7620.yml diff --git a/.github/workflows/MT7620.yml b/.github/workflows/MT7620.yml new file mode 100644 index 000000000..f82eee6e1 --- /dev/null +++ b/.github/workflows/MT7620.yml @@ -0,0 +1,198 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 P3TERX +# Copyright (C) 2019 KFERMercer +# +# +# + +name: OpenWrt18.06-CI +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: | + 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/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 + git clone https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-Jo + cd ../.. + rm -rfv package/lean/autocore + + # ==========以上是示范如何加入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 < Date: Sat, 29 Feb 2020 10:34:04 +0800 Subject: [PATCH 09/14] Delete MT7620.yml --- .github/workflows/MT7620.yml | 198 ----------------------------------- 1 file changed, 198 deletions(-) delete mode 100644 .github/workflows/MT7620.yml diff --git a/.github/workflows/MT7620.yml b/.github/workflows/MT7620.yml deleted file mode 100644 index f82eee6e1..000000000 --- a/.github/workflows/MT7620.yml +++ /dev/null @@ -1,198 +0,0 @@ -# -# This is free software, lisence use MIT. -# -# Copyright (C) 2019 P3TERX -# Copyright (C) 2019 KFERMercer -# -# -# - -name: OpenWrt18.06-CI -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: | - 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/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 - git clone https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-Jo - cd ../.. - rm -rfv package/lean/autocore - - # ==========以上是示范如何加入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 < Date: Sat, 29 Feb 2020 10:34:14 +0800 Subject: [PATCH 10/14] Delete openwrt18.06-ssr+.yml --- .github/workflows/openwrt18.06-ssr+.yml | 291 ------------------------ 1 file changed, 291 deletions(-) delete mode 100644 .github/workflows/openwrt18.06-ssr+.yml diff --git a/.github/workflows/openwrt18.06-ssr+.yml b/.github/workflows/openwrt18.06-ssr+.yml deleted file mode 100644 index fd071ff9f..000000000 --- a/.github/workflows/openwrt18.06-ssr+.yml +++ /dev/null @@ -1,291 +0,0 @@ -# -# This is free software, lisence use MIT. -# -# Copyright (C) 2019 P3TERX -# Copyright (C) 2019 KFERMercer -# -# -# - -name: OpenWrt18.06-CI -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: | - 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/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 - git clone https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-Jo - cd ../.. - rm -rfv package/lean/autocore - - # ==========以上是示范如何加入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 <> .config < Date: Sat, 29 Feb 2020 10:37:13 +0800 Subject: [PATCH 11/14] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 185 +++++++++++++++-------------- 1 file changed, 93 insertions(+), 92 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index 494e45792..acdc2928b 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-CI +name: OpenWrt18.06-CI-加强版 on: push: branches: @@ -57,16 +57,14 @@ jobs: 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/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 - git clone https://github.com/hong0980/luci-app-passwall.git package/luci-app-passwall - git clone https://github.com/Leo-Jo-My/luci-app-ssr-plus-Jo package/luci-app-ssr-plus-Jo - cd ../.. - rm -rfv package/lean/autocore - + rm -rfv package/lean/autocore + # ==========以上是示范如何加入tar.xz解包和拉github源码编译========== - name: Update feeds run: | @@ -140,7 +138,7 @@ jobs: CONFIG_PACKAGE_kmod-usb2-pci=y CONFIG_PACKAGE_kmod-usb3=y EOF - # 网卡支持: + # 网卡支持: cat >> .config <> .config <> .config <> .config < Date: Sat, 29 Feb 2020 11:22:32 +0800 Subject: [PATCH 12/14] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index acdc2928b..afe4608ab 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -61,6 +61,8 @@ jobs: git clone https://github.com/Sweet-Fairy/openwrt-package git clone https://github.com/Leo-Jo-My/luci-app-vssr + git clone https://github.com/hong0980/luci-app-passwall.git package/luci-app-passwall + git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo 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 rm -rfv package/lean/autocore @@ -198,6 +200,7 @@ jobs: CONFIG_PACKAGE_tcp-bbr-mod=y CONFIG_PACKAGE_tcp-bbr-nanqinlang=y CONFIG_PACKAGE_luci-app-vssr=y + CONFIG_PACKAGE_luci-app-ssr-plus-Jo=y CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-amule=y CONFIG_PACKAGE_luci-app-oaf=y From 928b9fd8ba3432eed8dd164ef25c3563e99b5c76 Mon Sep 17 00:00:00 2001 From: zh610902551 <610902551@qq.com> Date: Sat, 29 Feb 2020 17:16:02 +0800 Subject: [PATCH 13/14] Update openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 197 +++++++++++++---------------- 1 file changed, 90 insertions(+), 107 deletions(-) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml index afe4608ab..893898f7c 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/openwrt18.06.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-CI-加强版 +name: OpenWrt18.06-CI on: push: branches: @@ -51,22 +51,18 @@ jobs: 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 https://github.com/Leo-Jo-My/luci-app-vssr - git clone https://github.com/hong0980/luci-app-passwall.git package/luci-app-passwall - git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo 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 - rm -rfv package/lean/autocore - + git clone https://github.com/lisaac/luci-app-dockerman.git package/luci-app-dockerman # ==========以上是示范如何加入tar.xz解包和拉github源码编译========== - name: Update feeds run: | @@ -140,100 +136,93 @@ jobs: CONFIG_PACKAGE_kmod-usb2-pci=y CONFIG_PACKAGE_kmod-usb3=y EOF - # 网卡支持: - cat >> .config <> .config <> .config < Date: Sat, 29 Feb 2020 17:22:13 +0800 Subject: [PATCH 14/14] Create MT7620-5K.yml --- .github/workflows/MT7620-5K.yml | 247 ++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) create mode 100644 .github/workflows/MT7620-5K.yml diff --git a/.github/workflows/MT7620-5K.yml b/.github/workflows/MT7620-5K.yml new file mode 100644 index 000000000..2e5886e93 --- /dev/null +++ b/.github/workflows/MT7620-5K.yml @@ -0,0 +1,247 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 P3TERX +# Copyright (C) 2019 KFERMercer +# +# +# + +name: OpenWrt18.06-CI +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 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 + # ==========以上是示范如何加入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 <