diff --git a/.github/workflows/kenzo.yml b/.github/workflows/kenzo.yml index f36524d89..2694dfc65 100644 --- a/.github/workflows/kenzo.yml +++ b/.github/workflows/kenzo.yml @@ -52,6 +52,30 @@ jobs: rm -rf `find ./* -maxdepth 0 -type d ! -name "diy"` >/dev/null 2>&1 $GITHUB_WORKSPACE/${{matrix.target}}.sh $GITHUB_WORKSPACE/diy/convert_translation.sh + $GITHUB_WORKSPACE/diy/convert_translation.sh + + - name: Modify + run: | + shopt -s extglob + ( + sed -i \ + -e 's?include \.\./\.\./\(lang\|devel\)?include $(TOPDIR)/feeds/packages/\1?' \ + -e "s/\(PKG_HASH\|PKG_MD5SUM\|PKG_MIRROR_HASH\):=.*/\1:=skip/" \ + -e 's?\.\./\.\./luci.mk?$(TOPDIR)/feeds/luci/luci.mk?' \ + -e 's/ca-certificates/ca-bundle/' \ + */Makefile + ) & + for pkg in $(ls -d */); do + if [ "$(grep "PKG_RELEASE" $pkg/Makefile)" ]; then + sed -i "s/PKG_RELEASE:=.*/PKG_RELEASE:=$(git rev-list --count master $pkg)/" $pkg/Makefile || true + fi + done + + while [ ! -f /tmp/ok ]; do + echo "wait" + sleep 1 + done + - name: Upload env: diff --git a/18.06.sh b/18.06.sh index ac4e93174..83059a272 100755 --- a/18.06.sh +++ b/18.06.sh @@ -56,6 +56,8 @@ svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/tcpping svn co https://github.com/liuran001/openwrt-theme/trunk/luci-theme-argon-lr svn co https://github.com/openwrt/packages/trunk/net/shadowsocks-libev svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-aliddns +svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-udp2raw +svn co https://github.com/immortalwrt/packages/trunk/net/udp2raw-tunnel svn co https://github.com/kenzok8/jell/trunk/luci-app-adguardhome svn co https://github.com/kenzok8/jell/trunk/adguardhome svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-smartdns diff --git a/19.07.sh b/19.07.sh index 3461cc629..8766dd329 100755 --- a/19.07.sh +++ b/19.07.sh @@ -55,6 +55,8 @@ svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/microsocks svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/redsocks2 svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/tcpping svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-aliddns +svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-udp2raw +svn co https://github.com/immortalwrt/packages/trunk/net/udp2raw-tunnel svn co https://github.com/kenzok8/jell/trunk/luci-app-adguardhome svn co https://github.com/kenzok8/jell/trunk/adguardhome svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-smartdns diff --git a/diy/18.06.sh b/diy/18.06.sh index ac4e93174..83059a272 100755 --- a/diy/18.06.sh +++ b/diy/18.06.sh @@ -56,6 +56,8 @@ svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/tcpping svn co https://github.com/liuran001/openwrt-theme/trunk/luci-theme-argon-lr svn co https://github.com/openwrt/packages/trunk/net/shadowsocks-libev svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-aliddns +svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-udp2raw +svn co https://github.com/immortalwrt/packages/trunk/net/udp2raw-tunnel svn co https://github.com/kenzok8/jell/trunk/luci-app-adguardhome svn co https://github.com/kenzok8/jell/trunk/adguardhome svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-smartdns diff --git a/diy/19.07.sh b/diy/19.07.sh index 3461cc629..8766dd329 100755 --- a/diy/19.07.sh +++ b/diy/19.07.sh @@ -55,6 +55,8 @@ svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/microsocks svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/redsocks2 svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/tcpping svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-aliddns +svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-udp2raw +svn co https://github.com/immortalwrt/packages/trunk/net/udp2raw-tunnel svn co https://github.com/kenzok8/jell/trunk/luci-app-adguardhome svn co https://github.com/kenzok8/jell/trunk/adguardhome svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-smartdns