diff --git a/.github/workflows/Build-JDC-RE-SP-01B.yml b/.github/workflows/Build-JDC-RE-SP-01B.yml new file mode 100644 index 0000000..343661d --- /dev/null +++ b/.github/workflows/Build-JDC-RE-SP-01B.yml @@ -0,0 +1,190 @@ +# +# Copyright (c) 2019-2020 P3TERX +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# +# https://github.com/P3TERX/Actions-OpenWrt +# Description: Build OpenWrt using GitHub Actions +# + +name: Build JDC-RE-SP-01B + +on: + repository_dispatch: + workflow_dispatch: + inputs: + ssh: + description: 'SSH connection to Actions' + required: false + default: 'false' + +env: + REPO_URL: https://github.com/coolsnowwolf/openwrt + REPO_BRANCH: lede-17.01 + FEEDS_CONF: feeds.conf.default + CONFIG_FILE: JDC-RE-SP-01B.config + DIY_P1_SH: devices/JDC-RE-SP-01B/diy-part1.sh + DIY_P2_SH: devices/JDC-RE-SP-01B/diy-part2.sh + UPLOAD_BIN_DIR: false + UPLOAD_FIRMWARE: true + UPLOAD_COWTRANSFER: true + UPLOAD_WETRANSFER: true + UPLOAD_RELEASE: false + TZ: Asia/Shanghai + +jobs: + build: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@main + + - name: Initialization environment + env: + DEBIAN_FRONTEND: noninteractive + run: | + sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc + sudo -E apt-get -qq update + sudo -E apt-get -qq install $(curl -fsSL git.io/depends-ubuntu-2004) + sudo -E apt-get -qq autoremove --purge + sudo -E apt-get -qq clean + sudo timedatectl set-timezone "$TZ" + sudo mkdir -p /workdir + sudo chown $USER:$GROUPS /workdir + + - name: Clone source code + working-directory: /workdir + run: | + df -hT $PWD + git clone $REPO_URL -b $REPO_BRANCH openwrt + ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt + + - name: Load custom feeds + run: | + [ -e $FEEDS_CONF ] && mv $FEEDS_CONF openwrt/feeds.conf.default + chmod +x $DIY_P1_SH + cd openwrt + $GITHUB_WORKSPACE/$DIY_P1_SH + + - name: Update feeds + run: cd openwrt && ./scripts/feeds update -a + + - name: Install feeds + run: cd openwrt && ./scripts/feeds install -a + + - name: Load custom configuration + run: | + [ -e files ] && mv files openwrt/files + [ -e $GITHUB_WORKSPACE/config/$CONFIG_FILE ] && mv $GITHUB_WORKSPACE/config/$CONFIG_FILE openwrt/.config + chmod +x $DIY_P2_SH + cd openwrt + $GITHUB_WORKSPACE/$DIY_P2_SH + + - name: SSH connection to Actions + uses: P3TERX/ssh2actions@v1.0.0 + if: (github.event.inputs.ssh == 'true' && github.event.inputs.ssh != 'false') || contains(github.event.action, 'ssh') + env: + TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }} + TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} + + - name: Download package + id: package + run: | + cd openwrt + make defconfig + make download -j8 + find dl -size -1024c -exec ls -l {} \; + find dl -size -1024c -exec rm -f {} \; + + - name: Compile the firmware + id: compile + run: | + cd openwrt + echo -e "$(nproc) thread compile" + make -j$(nproc) || make -j1 || make -j1 V=s + echo "::set-output name=status::success" + grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME + [ -s DEVICE_NAME ] && echo "DEVICE_NAME=_$(cat DEVICE_NAME)" >> $GITHUB_ENV + echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV + + - name: Check space usage + if: (!cancelled()) + run: df -hT + + - name: Upload bin directory + uses: actions/upload-artifact@main + if: steps.compile.outputs.status == 'success' && env.UPLOAD_BIN_DIR == 'true' + with: + name: OpenWrt_bin${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} + path: openwrt/bin + + - name: Organize files + id: organize + if: env.UPLOAD_FIRMWARE == 'true' && !cancelled() + run: | + cd openwrt/bin/targets/*/* + rm -rf packages + echo "FIRMWARE=$PWD" >> $GITHUB_ENV + echo "::set-output name=status::success" + + - name: Upload firmware directory + uses: actions/upload-artifact@main + if: steps.organize.outputs.status == 'success' && !cancelled() + with: + name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} + path: ${{ env.FIRMWARE }} + + - name: Upload firmware to cowtransfer + id: cowtransfer + if: steps.organize.outputs.status == 'success' && env.UPLOAD_COWTRANSFER == 'true' && !cancelled() + run: | + curl -fsSL git.io/file-transfer | sh + ./transfer cow --block 2621440 -s -p 64 --no-progress ${FIRMWARE} 2>&1 | tee cowtransfer.log + echo "::warning file=cowtransfer.com::$(cat cowtransfer.log | grep https)" + echo "::set-output name=url::$(cat cowtransfer.log | grep https | cut -f3 -d" ")" + + - name: Upload firmware to WeTransfer + id: wetransfer + if: steps.organize.outputs.status == 'success' && env.UPLOAD_WETRANSFER == 'true' && !cancelled() + run: | + curl -fsSL git.io/file-transfer | sh + ./transfer wet -s -p 16 --no-progress ${FIRMWARE} 2>&1 | tee wetransfer.log + echo "::warning file=wetransfer.com::$(cat wetransfer.log | grep https)" + echo "::set-output name=url::$(cat wetransfer.log | grep https | cut -f3 -d" ")" + + - name: Generate release tag + id: tag + if: env.UPLOAD_RELEASE == 'true' && !cancelled() + run: | + echo "::set-output name=release_tag::$(date +"%Y.%m.%d-%H%M")" + touch release.txt + [ $UPLOAD_COWTRANSFER = true ] && echo "🔗 [Cowtransfer](${{ steps.cowtransfer.outputs.url }})" >> release.txt + [ $UPLOAD_WETRANSFER = true ] && echo "🔗 [WeTransfer](${{ steps.wetransfer.outputs.url }})" >> release.txt + echo "::set-output name=status::success" + + - name: Upload firmware to release + uses: softprops/action-gh-release@v1 + if: steps.tag.outputs.status == 'success' && !cancelled() + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.tag.outputs.release_tag }} + body_path: release.txt + files: ${{ env.FIRMWARE }}/* + + - name: Delete workflow runs + uses: GitRML/delete-workflow-runs@main + with: + retain_days: 1 + keep_minimum_runs: 3 + + - name: Remove old Releases + uses: dev-drprasad/delete-older-releases@v0.1.0 + if: env.UPLOAD_RELEASE == 'true' && !cancelled() + with: + keep_latest: 3 + delete_tags: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/config/JDC-RE-SP-01B.config b/config/JDC-RE-SP-01B.config new file mode 100644 index 0000000..4d49b98 --- /dev/null +++ b/config/JDC-RE-SP-01B.config @@ -0,0 +1,121 @@ +CONFIG_TARGET_ramips=y +CONFIG_TARGET_ramips_mt7621=y +CONFIG_TARGET_ramips_mt7621_DEVICE_jdcloud_re-sp-01b=y +CONFIG_LIBCURL_COOKIES=y +CONFIG_LIBCURL_FILE=y +CONFIG_LIBCURL_FTP=y +CONFIG_LIBCURL_HTTP=y +CONFIG_LIBCURL_NO_SMB="!" +CONFIG_LIBCURL_OPENSSL=y +CONFIG_LIBCURL_PROXY=y +CONFIG_PACKAGE_6in4=y +CONFIG_PACKAGE_SAMBA_MAX_DEBUG_LEVEL=-1 +CONFIG_PACKAGE_antfs-mount=y +CONFIG_PACKAGE_automount=y +CONFIG_PACKAGE_autosamba=y +CONFIG_PACKAGE_boost=y +CONFIG_PACKAGE_boost-program_options=y +CONFIG_PACKAGE_boost-system=y +CONFIG_PACKAGE_ca-bundle=y +CONFIG_PACKAGE_coreutils-nohup=y +CONFIG_PACKAGE_curl=y +CONFIG_PACKAGE_e2fsprogs=y +CONFIG_PACKAGE_fdisk=y +CONFIG_PACKAGE_ip6tables=y +CONFIG_PACKAGE_ipt2socks=y +CONFIG_PACKAGE_iptables-mod-iprange=y +CONFIG_PACKAGE_iputils-arping=y +CONFIG_PACKAGE_ipv6helper=y +CONFIG_PACKAGE_jq=y +# CONFIG_PACKAGE_kmod-fast-classifier is not set +CONFIG_PACKAGE_kmod-fs-antfs=y +CONFIG_PACKAGE_kmod-fs-exfat=y +CONFIG_PACKAGE_kmod-fs-vfat=y +CONFIG_PACKAGE_kmod-ipt-iprange=y +CONFIG_PACKAGE_kmod-ipt-nat6=y +CONFIG_PACKAGE_kmod-iptunnel=y +CONFIG_PACKAGE_kmod-iptunnel4=y +# CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set +CONFIG_PACKAGE_kmod-nf-nat6=y +CONFIG_PACKAGE_kmod-nls-cp437=y +CONFIG_PACKAGE_kmod-nls-iso8859-1=y +CONFIG_PACKAGE_kmod-nls-utf8=y +CONFIG_PACKAGE_kmod-scsi-core=y +# CONFIG_PACKAGE_kmod-shortcut-fe is not set +CONFIG_PACKAGE_kmod-sit=y +CONFIG_PACKAGE_kmod-tun=y +CONFIG_PACKAGE_kmod-usb-storage=y +CONFIG_PACKAGE_kmod-usb-storage-extras=y +CONFIG_PACKAGE_libblkid=y +CONFIG_PACKAGE_libcomerr=y +CONFIG_PACKAGE_libcurl=y +CONFIG_PACKAGE_libext2fs=y +CONFIG_PACKAGE_libfdisk=y +CONFIG_PACKAGE_libmbedtls=y +CONFIG_PACKAGE_libminiupnpc=y +CONFIG_PACKAGE_libnatpmp=y +CONFIG_PACKAGE_libncurses=y +CONFIG_PACKAGE_libsmartcols=y +CONFIG_PACKAGE_libss=y +CONFIG_PACKAGE_libstdcpp=y +CONFIG_PACKAGE_libsysfs=y +# CONFIG_PACKAGE_luci-app-adguardhome_INCLUDE_binary is not set +CONFIG_PACKAGE_luci-app-aliddns=y +CONFIG_PACKAGE_luci-app-argon-config=y +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_ShadowsocksR_Libev_Client is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_ShadowsocksR_Libev_Server is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Shadowsocks_Libev_Client is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Shadowsocks_Libev_Server is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Simple_obfs is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Socks5_Proxy is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Socks_Server is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Trojan is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Trojan-Go is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Xray is not set +# CONFIG_PACKAGE_luci-app-nlbwmon is not set +CONFIG_PACKAGE_luci-app-passwall=y +# CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ChinaDNS_NG is not set +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray=y +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y +CONFIG_PACKAGE_luci-app-pushbot=y +CONFIG_PACKAGE_luci-app-samba=y +# CONFIG_PACKAGE_luci-app-sfe is not set +# CONFIG_PACKAGE_luci-app-ssr-plus is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Client is not set +CONFIG_PACKAGE_luci-app-tencentddns=y +CONFIG_PACKAGE_luci-app-uhttpd=y +# CONFIG_PACKAGE_luci-app-unblockmusic is not set +# CONFIG_PACKAGE_luci-app-vsftpd is not set +CONFIG_PACKAGE_luci-app-zerotier=y +CONFIG_PACKAGE_luci-compat=y +CONFIG_PACKAGE_luci-i18n-aliddns-zh-cn=y +CONFIG_PACKAGE_luci-i18n-argon-config-zh-cn=y +CONFIG_PACKAGE_luci-i18n-passwall-zh-cn=y +CONFIG_PACKAGE_luci-i18n-samba-zh-cn=y +CONFIG_PACKAGE_luci-i18n-uhttpd-zh-cn=y +CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y +CONFIG_PACKAGE_luci-proto-ipv6=y +CONFIG_PACKAGE_nano=y +# CONFIG_PACKAGE_nlbwmon is not set +CONFIG_PACKAGE_odhcp6c=y +CONFIG_PACKAGE_odhcp6c_ext_cer_id=0 +CONFIG_PACKAGE_odhcpd-ipv6only=y +CONFIG_PACKAGE_odhcpd_ipv6only_ext_cer_id=0 +CONFIG_PACKAGE_samba36-server=y +CONFIG_PACKAGE_shadowsocks-libev-ss-local=y +CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y +# CONFIG_PACKAGE_shadowsocksr-libev-ssr-check is not set +CONFIG_PACKAGE_simple-obfs=y +CONFIG_PACKAGE_terminfo=y +CONFIG_PACKAGE_trojan-plus=y +CONFIG_PACKAGE_unzip=y +# CONFIG_PACKAGE_vsftpd-alt is not set +CONFIG_PACKAGE_wsdd2=y +CONFIG_PACKAGE_xray-core=y +CONFIG_PACKAGE_xray-plugin=y +CONFIG_PACKAGE_zerotier=y +# CONFIG_TARGET_ROOTFS_INITRAMFS is not set +CONFIG_boost-compile-visibility-hidden=y +CONFIG_boost-runtime-shared=y +CONFIG_boost-static-and-shared-libs=y +CONFIG_boost-variant-release=y diff --git a/devices/HC5962/diy-part2.sh b/devices/HC5962/diy-part2.sh index c4d9ccc..f86a37a 100644 --- a/devices/HC5962/diy-part2.sh +++ b/devices/HC5962/diy-part2.sh @@ -13,6 +13,9 @@ # Modify default IP sed -i 's/192.168.1.1/192.168.199.1/g' package/base-files/files/bin/config_generate +# Modify hostname +sed -i "s/hostname='OpenWrt'/hostname='HIWIFI'/" package/base-files/files/bin/config_generate + # Modify default theme rm -rf package/lean/luci-theme-argon git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git package/lean/luci-theme-argon @@ -21,4 +24,15 @@ sed -i 's/luci-theme-bootstrap/luci-theme-argon/' feeds/luci/collections/luci/Ma # Add Packages git clone https://github.com/destan19/OpenAppFilter package/OpenAppFilter git clone https://github.com/MapesxGM/luci-app-tencentddns package/luci-app-tencentddns -git clone https://github.com/jerrykuku/luci-app-argon-config package/luci-app-argon-config \ No newline at end of file +git clone https://github.com/jerrykuku/luci-app-argon-config package/luci-app-argon-config + +# Modify the number of connections +cat >> package/base-files/files/etc/sysctl.conf < +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# +# https://github.com/P3TERX/Actions-OpenWrt +# File name: diy-part1.sh +# Description: OpenWrt DIY script part 1 (Before Update feeds) +# + +# Uncomment a feed source +#sed -i 's/^#\(.*helloworld\)/\1/' feeds.conf.default + +# Add a feed source + +cat >> feeds.conf.default < +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# +# https://github.com/P3TERX/Actions-OpenWrt +# File name: diy-part2.sh +# Description: OpenWrt DIY script part 2 (After Update feeds) +# + +# Modify default IP +sed -i 's/192.168.1.1/192.168.199.1/g' package/base-files/files/bin/config_generate + +# Modify hostname +sed -i "s/hostname='OpenWrt'/hostname='JDCloud'/" package/base-files/files/bin/config_generate + +# Modify default theme +rm -rf package/lean/luci-theme-argon +git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git package/lean/luci-theme-argon +sed -i 's/luci-theme-bootstrap/luci-theme-argon/' feeds/luci/collections/luci/Makefile + +# Add Packages +# git clone https://github.com/destan19/OpenAppFilter package/OpenAppFilter +git clone https://github.com/MapesxGM/luci-app-tencentddns package/luci-app-tencentddns +git clone https://github.com/jerrykuku/luci-app-argon-config package/luci-app-argon-config + +# Modify the number of connections +cat >> package/base-files/files/etc/sysctl.conf <> package/base-files/files/etc/sysctl.conf <