From c0f83536a31aa8525be734700cc3d73a0e5c939f Mon Sep 17 00:00:00 2001 From: zh610902551 <610902551@qq.com> Date: Mon, 30 Mar 2020 19:58:07 +0800 Subject: [PATCH 1/7] OpenWrt18.06 x86 MT7620 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenWrt18.06 x86改MT7620 --- ...enwrt18.06.yml => OpenWrt18.06 MT7620.yml} | 77 ++----------------- 1 file changed, 6 insertions(+), 71 deletions(-) rename .github/workflows/{openwrt18.06.yml => OpenWrt18.06 MT7620.yml} (72%) diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/OpenWrt18.06 MT7620.yml similarity index 72% rename from .github/workflows/openwrt18.06.yml rename to .github/workflows/OpenWrt18.06 MT7620.yml index 753d3dfcc..b671f1fd1 100644 --- a/.github/workflows/openwrt18.06.yml +++ b/.github/workflows/OpenWrt18.06 MT7620.yml @@ -7,7 +7,7 @@ # # -name: OpenWrt18.06-CI +name: OpenWrt18.06 MT7620 on: push: branches: @@ -108,9 +108,9 @@ jobs: # # 编译x64固件: cat >> .config <> .config <> .config <> .config < Date: Tue, 31 Mar 2020 11:18:37 +0800 Subject: [PATCH 2/7] Update OpenWrt18.06 MT7620.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删减 --- .github/workflows/OpenWrt18.06 MT7620.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OpenWrt18.06 MT7620.yml b/.github/workflows/OpenWrt18.06 MT7620.yml index b671f1fd1..64f925f37 100644 --- a/.github/workflows/OpenWrt18.06 MT7620.yml +++ b/.github/workflows/OpenWrt18.06 MT7620.yml @@ -162,7 +162,7 @@ jobs: CONFIG_PACKAGE_luci-app-passwall=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-lean=y EOF # LuCI主题: cat >> .config < Date: Tue, 31 Mar 2020 11:32:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?OpenWrt18.06=20MT7620=20vssr=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 只增加VSSR版本 --- .../workflows/OpenWrt18.06 MT7620 vssr.yml | 432 ++++++++++++++++++ 1 file changed, 432 insertions(+) create mode 100644 .github/workflows/OpenWrt18.06 MT7620 vssr.yml diff --git a/.github/workflows/OpenWrt18.06 MT7620 vssr.yml b/.github/workflows/OpenWrt18.06 MT7620 vssr.yml new file mode 100644 index 000000000..9a8cbfa91 --- /dev/null +++ b/.github/workflows/OpenWrt18.06 MT7620 vssr.yml @@ -0,0 +1,432 @@ +# + +# This is free software, lisence use MIT. + +# + +# Copyright (C) 2019 P3TERX + +# Copyright (C) 2019 KFERMercer + +# + +# + +# + +name: OpenWrt18.06 MT7620 + +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 + + rm -rfv package/lean/luci-app-adbyby-plus + + 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 + + tar xvJf luci-app-adbyby-plus.tar.xz + + git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo + + git clone https://github.com/Sweet-Fairy/openwrt-package + + 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/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: Wed, 1 Apr 2020 20:31:48 +0800 Subject: [PATCH 4/7] Update OpenWrt18.06 MT7620 vssr.yml --- .../workflows/OpenWrt18.06 MT7620 vssr.yml | 230 +----------------- 1 file changed, 12 insertions(+), 218 deletions(-) diff --git a/.github/workflows/OpenWrt18.06 MT7620 vssr.yml b/.github/workflows/OpenWrt18.06 MT7620 vssr.yml index 9a8cbfa91..816059520 100644 --- a/.github/workflows/OpenWrt18.06 MT7620 vssr.yml +++ b/.github/workflows/OpenWrt18.06 MT7620 vssr.yml @@ -1,35 +1,20 @@ # - # This is free software, lisence use MIT. - # - # Copyright (C) 2019 P3TERX - # Copyright (C) 2019 KFERMercer - # - # - # name: OpenWrt18.06 MT7620 - on: - push: - branches: - - master - # schedule: - # - cron: 0 20 * * * - # release: - # types: [published] jobs: @@ -41,392 +26,201 @@ jobs: 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 - rm -rfv package/lean/luci-app-adbyby-plus - 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 - tar xvJf luci-app-adbyby-plus.tar.xz - git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo - git clone https://github.com/Sweet-Fairy/openwrt-package - 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/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 <> .config < Date: Fri, 3 Apr 2020 13:44:29 +0800 Subject: [PATCH 5/7] Create openwrt18.06.yml --- .github/workflows/openwrt18.06.yml | 299 +++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+) create mode 100644 .github/workflows/openwrt18.06.yml diff --git a/.github/workflows/openwrt18.06.yml b/.github/workflows/openwrt18.06.yml new file mode 100644 index 000000000..12e1732b1 --- /dev/null +++ b/.github/workflows/openwrt18.06.yml @@ -0,0 +1,299 @@ +# +# 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 + rm -rfv package/lean/luci-app-adbyby-plus + 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 + tar xvJf luci-app-adbyby-plus.tar.xz + tar xvJf luci-app-vssr.tar.xz + git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo + git clone https://github.com/Sweet-Fairy/openwrt-package + 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/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 <> .config < Date: Sat, 4 Apr 2020 00:06:26 +0800 Subject: [PATCH 6/7] Update OpenWrt18.06 MT7620 vssr.yml --- .../workflows/OpenWrt18.06 MT7620 vssr.yml | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/OpenWrt18.06 MT7620 vssr.yml b/.github/workflows/OpenWrt18.06 MT7620 vssr.yml index 816059520..98a3c150a 100644 --- a/.github/workflows/OpenWrt18.06 MT7620 vssr.yml +++ b/.github/workflows/OpenWrt18.06 MT7620 vssr.yml @@ -16,6 +16,10 @@ on: # - cron: 0 20 * * * # release: # types: [published] +env: + SSH_ACTIONS: true + + jobs: @@ -63,7 +67,6 @@ jobs: git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo git clone https://github.com/Sweet-Fairy/openwrt-package 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/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 ========== @@ -74,6 +77,12 @@ jobs: run: | ./scripts/feeds update -a ./scripts/feeds install -a + + + - name: SSH connection to Actions + uses: P3TERX/debugger-action@master + if: env.SSH_ACTIONS == 'true' + - name: Generate configuration file run: | rm -f ./.config* @@ -107,11 +116,10 @@ jobs: # 无论你想要对固件进行怎样的定制, 都需要且只需要修改 EOF 回环内的内容. # # 编译x64固件: - cat >> .config <> .config < Date: Sat, 4 Apr 2020 10:44:55 +0800 Subject: [PATCH 7/7] Delete OpenWrt18.06 MT7620.yml --- .github/workflows/OpenWrt18.06 MT7620.yml | 227 ---------------------- 1 file changed, 227 deletions(-) delete mode 100644 .github/workflows/OpenWrt18.06 MT7620.yml diff --git a/.github/workflows/OpenWrt18.06 MT7620.yml b/.github/workflows/OpenWrt18.06 MT7620.yml deleted file mode 100644 index 64f925f37..000000000 --- a/.github/workflows/OpenWrt18.06 MT7620.yml +++ /dev/null @@ -1,227 +0,0 @@ -# -# This is free software, lisence use MIT. -# -# Copyright (C) 2019 P3TERX -# Copyright (C) 2019 KFERMercer -# -# -# - -name: OpenWrt18.06 MT7620 -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 - rm -rfv package/lean/luci-app-adbyby-plus - 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 - tar xvJf luci-app-adbyby-plus.tar.xz - git clone https://github.com/Sweet-Fairy/luci-app-ssr-plus-Jo - git clone https://github.com/Sweet-Fairy/openwrt-package - 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/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 <