Test Mode

.github/workflows/X-x86_64_X.yml

@@ -153,6 +153,7 @@ jobs:
       run: |
         sudo -E apt-get update
         sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync
+        sudo -E apt-get -y install llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
         sudo chown $USER:$GROUPS /workdir
@@ -215,9 +216,40 @@ jobs:
         rm package/feeds/packages/adguardhome -rf
         rm feeds/packages/net/adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
-        make -j4 || make -j1 V=s
+        # 2024.03.03 mosdns build fail by golang 1.22
+        sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
+        make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
+
+
+    - name: Check Build Update
+      run: |
+        export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
+        export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
+        bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
+  
+    - name: Upload Package Version to Github Release
+      uses: svenstaro/upload-release-action@v2
+      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
+        file_glob: true
+        tag: v${{ steps.date.outputs.date }}
+        overwrite: true
+  
+    - name: Upload Package Update to Github Release
+      uses: svenstaro/upload-release-action@v2
+      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: ${{env.Tempoary_FLAG}}_build_pkg_up.log 
+        file_glob: true
+        tag: v${{ steps.date.outputs.date }}
+        overwrite: true
+
+
     - name: Process Firmware
       if: env.Result == 'true' && !cancelled()
       run: |

.github/workflows/X-x86_64_Y.yml

@@ -143,6 +143,7 @@ jobs:
       run: |
         sudo -E apt-get update
         sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync
+        sudo -E apt-get -y install llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
         sudo chown $USER:$GROUPS /workdir
@@ -212,9 +213,38 @@ jobs:
         rm package/feeds/packages/adguardhome -rf
         rm feeds/packages/net/adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
-        make -j4 || make -j1 V=s
+        # 2024.03.03 mosdns build fail by golang 1.22
+        sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
+        make -j4 | tee ./build_log.log || make -j1 V=s
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
+
+    - name: Check Build Update
+      run: |
+        export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
+        export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
+        bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
+  
+    - name: Upload Package Version to Github Release
+      uses: svenstaro/upload-release-action@v2
+      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
+        file_glob: true
+        tag: v${{ steps.date.outputs.date }}
+        overwrite: true
+  
+    - name: Upload Package Update to Github Release
+      uses: svenstaro/upload-release-action@v2
+      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: ${{env.Tempoary_FLAG}}_build_pkg_up.log 
+        file_glob: true
+        tag: v${{ steps.date.outputs.date }}
+        overwrite: true
+
     - name: Process Firmware
       if: env.Result == 'true' && !cancelled()
       run: |

.github/workflows/X-x86_64_Z.yml

@@ -140,6 +140,7 @@ jobs:
       run: |
         sudo -E apt-get update
         sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync
+        sudo -E apt-get -y install llvm clang
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
         sudo chown $USER:$GROUPS /workdir
@@ -209,9 +210,37 @@ jobs:
         rm package/feeds/packages/adguardhome -rf
         rm feeds/packages/net/adguardhome -rf
         ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
-        make -j4 || make -j1 V=s
+        make -j4 | tee ./build_log.log || make -j1 V=s
+        # 2024.03.03 mosdns build fail by golang 1.22
+        sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
         [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
 
+    - name: Check Build Update
+      run: |
+        export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
+        export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
+        bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
+  
+    - name: Upload Package Version to Github Release
+      uses: svenstaro/upload-release-action@v2
+      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
+        file_glob: true
+        tag: v${{ steps.date.outputs.date }}
+        overwrite: true
+  
+    - name: Upload Package Update to Github Release
+      uses: svenstaro/upload-release-action@v2
+      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: ${{env.Tempoary_FLAG}}_build_pkg_up.log 
+        file_glob: true
+        tag: v${{ steps.date.outputs.date }}
+        overwrite: true
+
     - name: Process Firmware
       if: env.Result == 'true' && !cancelled()
       run: |

Configs/x86_64-X

@@ -13,7 +13,7 @@ CONFIG_PACKAGE_luci-lib-docker=y
 # Hello World
 # CONFIG_PACKAGE_luci-app-vssr=y
 # Kernel 5.15
-CONFIG_TESTING_KERNEL=y
+# CONFIG_TESTING_KERNEL=y
 # Theme
 CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y

Configs/x86_64-Z

@@ -25,8 +25,16 @@ CONFIG_PACKAGE_adguardhome=y
 # Dnsmasq 及IPV6,AutoUpdate
 CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
-CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
 CONFIG_PACKAGE_luci-app-autoupdate=y
+# IPv6 支持
+CONFIG_IPV6=y
+CONFIG_KERNEL_IPV6=y
+CONFIG_PACKAGE_ipv6helper=y
+CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
+CONFIG_PACKAGE_6in4=y
+CONFIG_PACKAGE_6rd=y
+CONFIG_PACKAGE_6to4=y
+
 # Netdata
 CONFIG_PACKAGE_luci-app-netdata=y
 # Diskman

Scripts/AutoBuild_Upcheck.sh

@@ -0,0 +1,121 @@
+#!/bin/bash
+
+Check_build_Version(){
+        pkg_line=$1
+        X_BUILD_TAG=$2
+        pkg_name=${pkg_line%=*}
+        pkg_new_version=${pkg_line#*=}
+        pkg_info=`cat ${X_BUILD_TAG}_build_pkg_ver_old.log | grep "^$pkg_name=" -m 1 `
+        pkg_old_version=${pkg_info#*=}
+        if [ "$pkg_old_version" != "$pkg_new_version" ]
+        then
+                if [ "$pkg_old_version" != "" ]
+                then
+                        echo ${pkg_name}:"$pkg_old_version>>$pkg_new_version" >> ${X_BUILD_TAG}_build_pkg_up.log 
+                        echo ${pkg_name}:"$pkg_old_version>>$pkg_new_version"
+                else
+                        echo "Add ${pkg_name}:${pkg_new_version}" >> ${X_BUILD_TAG}_build_pkg_up.log 
+                fi
+        fi
+
+}
+
+cat openwrt/build_log.log  | grep -v "host-compile" |grep "make\[3\]" | grep -E "package/|feeds/" > build_cmd.log
+cat build_cmd.log | awk '{print substr($3,1)}' > build_package.log
+
+X_LINUX_VERSION=`cat openwrt/target/linux/x86/Makefile | grep KERNEL_PATCHVER:=`
+X_LINUX_VERSION_TESTING=`cat openwrt/target/linux/x86/Makefile | grep KERNEL_TESTING_PATCHVER:=`
+X_LINUX_VERSION=${X_LINUX_VERSION#*=}
+X_LINUX_VERSION_TESTING=${X_LINUX_VERSION_TESTING#*=}
+echo LINUX_VERSION=${X_LINUX_VERSION} > ${1}_build_pkg_ver.log
+echo LINUX_VERSION_TESTING=${X_LINUX_VERSION_TESTING} >> ${1}_build_pkg_ver.log
+
+while read -r build_pkg_dir
+do
+    build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile |  grep "\bPKG_VERSION:=" -m 1`
+
+        if [ "${build_pkg_dir##*/}" = "dnsmasq" ]
+	then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_UPSTREAM_VERSION:= -m 1`
+	fi
+
+	if [ "${build_pkg_dir##*/}" = "ppp" ]
+	then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_RELEASE_VERSION:= -m 1`
+	fi
+
+	if [ "${build_pkg_dir##*/}" = "bpf-headers" ]
+	then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_PATCHVER:= -m 1`
+	fi
+
+    if [ "${build_pkg_dir##*/}" = "dsl-vrx200-firmware-xdsl" ]
+    then
+        build_pkg_ver=""
+    fi
+
+    if [ "${build_pkg_dir##*/}" = "UnblockNeteaseMusic" ]
+    then
+        build_pkg_ver=""
+    fi
+
+    if [ "${build_pkg_dir##*/}" = "perf" ]
+    then
+        build_pkg_ver=${X_LINUX_VERSION}
+    fi
+
+    if [ "${build_pkg_dir##*/}" = "golang" ]
+    then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep GO_VERSION_MAJOR_MINOR:= -m 1`
+        build_pkg_ver=${build_pkg_ver#*=}
+        GO_VERSION_PATCH=`cat openwrt/${build_pkg_dir}/Makefile | grep GO_VERSION_PATCH:= -m 1`
+        GO_VERSION_PATCH=${GO_VERSION_PATCH#*=}
+        build_pkg_ver=${build_pkg_ver}.${GO_VERSION_PATCH}
+    fi
+
+    if  [ "$build_pkg_ver" = "" ]
+    then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_VERSION=" -m 1`
+    fi
+
+    if  [ "$build_pkg_ver" = "" ]
+    then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_RELEASE:=" -m 1`
+    fi
+
+    if  [ "$build_pkg_ver" = "" ]
+    then
+        build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_RELEASE=" -m 1`
+    fi
+
+    build_pkg_ver=${build_pkg_ver#*=}
+    echo ${build_pkg_dir##*/}=$build_pkg_ver >> ${1}_build_pkg_ver.log
+done < "build_package.log"
+
+        # export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
+        # export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
+wget https://api.github.com/repos/X-OpenWrt/X-OpenWrt-Dev/releases -O releases.json
+cat releases.json | jq  '.[].tag_name' -r > version.old
+echo ${NOW_DATA_VERSION}
+diff_version=v2023-1-1
+while read -r last_version
+do
+        if [[ "$last_version" != "AutoUpdate" ]]
+        then
+                if [[ "$last_version" < ${NOW_DATA_VERSION} ]]
+                then
+                        if [[ "$last_version" > ${diff_version} ]]
+                        then
+                                diff_version=$last_version
+                        fi
+                fi
+        fi
+done < "version.old"
+wget -O ${1}_build_pkg_ver_old.log https://github.com/X-OpenWrt/X-OpenWrt-Dev/releases/download/${diff_version}/${1}_build_pkg_ver.log
+
+# Check_build_Version "LINUX_VERSION=${X_LINUX_VERSION}" ${1}
+echo "Tag:${1} Vesion Check" >> ${1}_build_pkg_up.log 
+while read -r make_version_line
+do
+        Check_build_Version $make_version_line ${1}
+done < "${1}_build_pkg_ver.log"