update workflow

.github/workflows/build-openwrt.yml

@@ -64,17 +64,17 @@ jobs:
         git clone $REPO_URL -b $REPO_BRANCH openwrt
         ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
         cd openwrt
-        git reset --hard 26f3634631244eedfbdfd61ea6cc3a2d7f5d896f
+        #git reset --hard 26f3634631244eedfbdfd61ea6cc3a2d7f5d896f
         #git revert -n edbd8d2e9839357f3a4f0a06174d243f362b1544 ||:
         #git config --global user.email "[email protected]"
         #git config --global user.name "example"
         #git add -u
         #git commit -m "revert ipq807x: drop all xiaomi devices support"
         #git revert --continue
     
-    - name: Revert ipq807x drop all xiaomi devices support
-      #run: cp -rf $GITHUB_WORKSPACE/AX6/* openwrt/
-      run: cp -rf $GITHUB_WORKSPACE/AX6/generic.mk openwrt/target/linux/ipq807x/image/generic.mk
+        #- name: Revert ipq807x drop all xiaomi devices support
+        #run: cp -rf $GITHUB_WORKSPACE/AX6/* openwrt/
+        #run: cp -rf $GITHUB_WORKSPACE/AX6/generic.mk openwrt/target/linux/ipq807x/image/generic.mk
 
     - name: Load custom feeds
       run: |

diy-part2.sh

@@ -42,12 +42,6 @@ sed -i 's/192.168.1.1/192.168.123.1/g' package/base-files/files/bin/config_gener
 sed -i "s/hostname='OpenWrt'/hostname='Redmi-AX6'/g" package/base-files/files/bin/config_generate
 sed -i "s/hostname='ImmortalWrt'/hostname='Redmi-AX6'/g" package/base-files/files/bin/config_generate
 
-#更换msd_lite为最新版（immortalwrt源）
-rm -rf feeds/packages/net/msd_lite
-git_sparse_clone master https://github.com/immortalwrt/packages immortalwrt net/msd_lite && mv -n msd_lite feeds/packages/net/msd_lite
-
-
-
 
 ###################################################################################################################################
 
@@ -81,5 +75,19 @@ git_sparse_clone master https://github.com/immortalwrt/packages immortalwrt net/
 rm -rf feeds/packages/lang/golang
 cp -rf $GITHUB_WORKSPACE/general/golang feeds/packages/lang/golang
 
+#为immortalwrt添加turboacc
+[ ! -e package/lean/default-settings/files/zzz-default-settings ] && curl -sSL https://raw.githubusercontent.com/chenmozhijin/turboacc/luci/add_turboacc.sh -o add_turboacc.sh && bash add_turboacc.sh
+
+#为immortalwrt添加luci-app-mwan3helper-chinaroute（MWAN3 分流助手）
+[ ! -e package/lean/default-settings/files/zzz-default-settings ] && git clone -b main https://github.com/padavanonly/luci-app-mwan3helper-chinaroute package/luci-app-mwan3helper-chinaroute
+
+#更换旧版lede代码中的ath11k-firmware源（旧源已失效）
+#[ -e package/lean/default-settings/files/zzz-default-settings ] && rm -rf package/firmware/ath11k-firmware/Makefile
+#[ -e package/lean/default-settings/files/zzz-default-settings ] && cp -rf $GITHUB_WORKSPACE/backup/AX6/package/firmware/ath11k-firmware/Makefile package/firmware/ath11k-firmware/Makefile
+
+#更换miniupnpd为最新版（immortalwrt源）
+[ -e package/lean/default-settings/files/zzz-default-settings ] && rm -rf feeds/packages/net/miniupnpd
+[ -e package/lean/default-settings/files/zzz-default-settings ] && git_sparse_clone master https://github.com/immortalwrt/packages immortalwrt net/miniupnpd && mv -n miniupnpd feeds/packages/net/miniupnpd
+
 ./scripts/feeds update -a
 ./scripts/feeds install -a

general/golang/golang/Makefile

@@ -7,7 +7,7 @@
 
 include $(TOPDIR)/rules.mk
 
-GO_VERSION_MAJOR_MINOR:=1.22
+GO_VERSION_MAJOR_MINOR:=1.23
 GO_VERSION_PATCH:=1
 
 PKG_NAME:=golang
@@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
 
 PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
 PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
-PKG_HASH:=79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321
+PKG_HASH:=6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d
 
 PKG_MAINTAINER:=Jeffery To <[email protected]>
 PKG_LICENSE:=BSD-3-Clause