Compare commits

...
Author SHA1 Message Date
xopenwrt 57513cf4f8 update golang 2026-06-12 23:18:48 +08:00
xopenwrt da8ae4c8ef fix bug 2026-06-12 21:42:14 +08:00
xopenwrt 44c434d397 fix passwall 2026-06-12 21:37:32 +08:00
2 changed files with 3 additions and 3 deletions
+3 -1
View File
@@ -176,7 +176,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -208,6 +208,8 @@ jobs:
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
cd openwrt cd openwrt
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
rm -rf package/feeds/luci/applications/luci-app-passwall
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
-2
View File
@@ -113,8 +113,6 @@ EOF
patch < ${CustomFiles}/d-team_newifi-d2_mt76_dualband.patch -p1 -d ${WORK} patch < ${CustomFiles}/d-team_newifi-d2_mt76_dualband.patch -p1 -d ${WORK}
;; ;;
x86_64) x86_64)
rm -rf ${FEEDS_PKG}/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
rm -rf ${FEEDS_LUCI}/applications/luci-app-passwall
Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main