update golang version

.github/workflows/X-x86_64_X.yml

@@ -72,7 +72,6 @@ jobs:
         echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
         if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
         then
-            docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
             sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
             sudo -E apt-get -y autoremove --purge
             sudo -E apt-get clean
@@ -181,7 +180,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 

.github/workflows/X-x86_64_X_Mine.yml

@@ -170,7 +170,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 

.github/workflows/X-x86_64_Y.yml

@@ -149,7 +149,6 @@ jobs:
         sudo chown $USER:$GROUPS /workdir
         if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
         then
-          docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
           sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
           sudo -E apt-get -y autoremove --purge
           sudo -E apt-get clean
@@ -178,7 +177,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 

.github/workflows/X-x86_64_Z.yml

@@ -147,7 +147,6 @@ jobs:
         if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
         then
           docker images
-          docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
           sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
           sudo -E apt-get -y autoremove --purge
           sudo -E apt-get clean
@@ -176,7 +175,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 
@@ -248,6 +247,7 @@ jobs:
         cd openwrt
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
         Firmware_Diy_End
+        ls bin/Firmware
 
     - name: Upload Firmware to Artifacts
       uses: actions/upload-artifact@main
@@ -392,6 +392,7 @@ jobs:
       if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
       run: |
         rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
+        ls openwrt/bin/Firmware
 
     - name: Upload Firmware to Github Release
       uses: svenstaro/upload-release-action@v2

.github/workflows/X-x86_64_Z_Mine.yml

@@ -166,7 +166,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 

.github/workflows/X-x86_64_Z_Mine_home.yml

@@ -166,7 +166,7 @@ jobs:
         ./scripts/feeds uninstall luci-theme-argon
         # Update golang to 1.22 for xray-core build
         rm -rf feeds/packages/lang/golang
-        git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug
 

Configs/x86_64-Test

@@ -18,11 +18,11 @@ CONFIG_PACKAGE_hostapd-common=y
 CONFIG_PACKAGE_wpa-supplicant=y
 
 # Theme
-CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
-# CONFIG_PACKAGE_luci-theme-edge=y
+
+# 
 # # CONFIG_PACKAGE_luci-theme-argon is not set
 # CONFIG_PACKAGE_luci-theme-argon-mod=y
-# CONFIG_PACKAGE_luci-theme-neobird=y
+# # CONFIG_PACKAGE_luci-theme-neobird is not set
 # passwall
 # CONFIG_PACKAGE_luci-app-passwall=y
 # # Adguard Home

Configs/x86_64-X

@@ -16,11 +16,11 @@ CONFIG_PACKAGE_luci-lib-docker=y
 # KERNEL_TESTING_PATCHVER:=6.12
 # CONFIG_TESTING_KERNEL=y
 # Theme
-CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
+
 CONFIG_PACKAGE_luci-theme-bootstrap=y
 CONFIG_PACKAGE_luci-theme-material=y
-CONFIG_PACKAGE_luci-theme-neobird=y
-CONFIG_PACKAGE_luci-theme-edge=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
+
 
 # wifi
 # 7625d Adapter
@@ -124,7 +124,7 @@ CONFIG_PACKAGE_luci-app-nfs=y
 CONFIG_PACKAGE_luci-app-npc=y
 CONFIG_PACKAGE_luci-app-openclash=y
 CONFIG_PACKAGE_luci-app-onliner=y
-CONFIG_PACKAGE_luci-app-passwall2=y
+CONFIG_PACKAGE_luci-app-passwall=y
 CONFIG_PACKAGE_luci-app-pptp-server=y
 CONFIG_PACKAGE_luci-app-qbittorrent=y
 # CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set

Configs/x86_64-Y

@@ -8,13 +8,13 @@ CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
 # KERNEL_TESTING_PATCHVER:=6.12
 # CONFIG_TESTING_KERNEL=y
 # Theme
-CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
+
 # CONFIG_PACKAGE_luci-theme-argon is not set
 CONFIG_PACKAGE_luci-theme-argon-mod=y
-CONFIG_PACKAGE_luci-theme-neobird=y
-CONFIG_PACKAGE_luci-theme-edge=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
+
 # passwall
-CONFIG_PACKAGE_luci-app-passwall2=y
+CONFIG_PACKAGE_luci-app-passwall=y
 # Adguard Home
 CONFIG_PACKAGE_luci-app-adguardhome=y
 CONFIG_PACKAGE_adguardhome=y

Configs/x86_64-Z

@@ -13,13 +13,13 @@ CONFIG_IB_STANDALONE=y
 # KERNEL_TESTING_PATCHVER:=6.12
 # CONFIG_TESTING_KERNEL=y
 # Theme
-CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
-CONFIG_PACKAGE_luci-theme-edge=y
+
+
 # CONFIG_PACKAGE_luci-theme-argon is not set
 CONFIG_PACKAGE_luci-theme-argon-mod=y
-CONFIG_PACKAGE_luci-theme-neobird=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
 # passwall
-CONFIG_PACKAGE_luci-app-passwall2=y
+CONFIG_PACKAGE_luci-app-passwall=y
 # Adguard Home
 CONFIG_PACKAGE_luci-app-adguardhome=y
 CONFIG_PACKAGE_adguardhome=y

Configs/x86_64-Z-Test

@@ -13,11 +13,11 @@ CONFIG_IB_STANDALONE=y
 # KERNEL_TESTING_PATCHVER:=6.1
 CONFIG_TESTING_KERNEL=y
 # Theme
-CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
-CONFIG_PACKAGE_luci-theme-edge=y
+
+
 # CONFIG_PACKAGE_luci-theme-argon is not set
 CONFIG_PACKAGE_luci-theme-argon-mod=y
-CONFIG_PACKAGE_luci-theme-neobird=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
 # passwall
 CONFIG_PACKAGE_luci-app-passwall2=y
 # Adguard Home

Scripts/AutoBuild_DiyScript.sh

@@ -78,7 +78,7 @@ EOF
 		done ; unset i
 
 		AddPackage svn apps minieap immortalwrt openwrt-18.06 packages net
-		AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
+		# AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
 		AddPackage git lean luci-app-argon-config jerrykuku master
 		AddPackage git other OpenClash vernesong master
 		# AddPackage git other luci-app-vssr jerrykuku master
@@ -123,7 +123,7 @@ EOF
 			sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
 			#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
 			# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
-			patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
+			# patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
 			#fix hostapd
 			sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
 		;;

Scripts/AutoBuild_Function.sh

@@ -23,8 +23,11 @@ Firmware_Diy_Before() {
 	fi
 	case "${OP_AUTHOR}/${OP_REPO}" in
 	coolsnowwolf/lede)
+		# Version_File=package/lean/default-settings/files/zzz-default-settings
+		# zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
 		Version_File=package/lean/default-settings/files/zzz-default-settings
-		zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
+		Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION)
+		zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
 		OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
 	;;
 	immortalwrt/immortalwrt)

Scripts/AutoBuild_Getenv.sh

@@ -17,7 +17,8 @@ df -h
 echo "------------------------------- IP Address Info ------------------------------"
 IP=`curl ip.115115.xyz -s`
 curl ip.115115.xyz -s
-curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
+# curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
+curl -s  https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
 }
 
 Get_Release_Info() {