update golang version

fix
test
2026-09-27 07:14:43 +00:00 · 2025-11-25 00:14:07 +08:00 · 2025-11-22 21:58:53 +08:00 · 2025-11-22 19:38:19 +08:00 · 2025-11-22 15:16:25 +08:00 · 2025-11-22 15:08:39 +08:00
9 changed files with 15 additions and 12 deletions
@@ -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

@@ -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

@@ -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

@@ -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
@@ -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

@@ -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

@@ -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*
 		;;
@@ -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)
@@ -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() {
Author	SHA1	Message	Date
xopenwrt	2e53d1b1f1	update golang version	2025-11-25 00:14:07 +08:00
xopenwrt	de3b57e64e	fix	2025-11-22 21:58:53 +08:00
xopenwrt	c43892ad94	test	2025-11-22 19:38:19 +08:00
xopenwrt	71e6f55a4e	remove mac80211 patch	2025-11-22 15:16:25 +08:00
xopenwrt	6c7873d959	fix Release get	2025-11-22 15:08:39 +08:00
xopenwrt	f9b26dbad4	rm docker image rm	2025-11-22 14:49:26 +08:00
xopenwrt	dfc88ebf8a	fix ip API	2025-11-22 14:29:58 +08:00