build: Disable step "Cache toolchain" and fix host dir

This reverts commit b788e7e165.

.github/workflows/build.yml

@@ -3,6 +3,32 @@ name: build
 on:
   workflow_dispatch:
     inputs:
+      first_kernel_compile:
+        description: 'First kernel compile'
+        required: true
+        default: 'true'
+        type: choice
+        options:
+        - true
+        - false
+      test_build:
+        description: 'Test build'
+        required: true
+        default: 'false'
+        type: choice
+        options:
+        - true
+        - false
+      target_name:
+        description: 'Target Name'
+        required: false
+        default: 'r3d'
+        type: string
+      package_dir:
+        description: 'Package Dir'
+        required: false
+        default: ''
+        type: string
       fake_build:
         description: 'Fake build'
         required: true
@@ -18,12 +44,16 @@ on:
         type: string
 
 env:
-  FAKE_BUILD: ${{ github.event.inputs.fake_build }}
+  FIRST_KERNEL_COMPILE:  ${{ github.event.inputs.first_kernel_compile == 'true' }}
+  TEST_BUILD: ${{ github.event.inputs.test_build == 'true' }}
+  FAKE_BUILD: ${{ github.event.inputs.fake_build == 'true' }}
+  TAG_SUFFIX: ${{ github.event.inputs.fake_build == 'true' && '-fake' || github.event.inputs.test_build == 'true' && '-test' || '' }}
+  TARGET_NAME: ${{ github.event.inputs.target_name }}
+  PACKAGE_DIR: ${{ github.event.inputs.package_dir }}
   REPO_URL: https://github.com/openwrt-xiaomi/openwrt
   REPO_LNK: openwrt-xiaomi/openwrt
-  REPO_BRANCH: xq-24.10
+  REPO_BRANCH: xq-25.12
-  TAG_PREFIX: v24-
+  TAG_PREFIX: v25-
-  BUILD_ROOT: ${{ github.workspace }}/openwrt
   DEPENDENCIES: ${{ github.workspace }}/dependencies-ubuntu.txt
   TZ: UTC
   DEVICE_NAME: unknown
@@ -45,6 +75,9 @@ jobs:
       fw_date: ${{ steps.gh.outputs.fw_date }}
       fw_ver: ${{ steps.gh.outputs.fw_ver }}
       is_active: ${{ steps.activity.outputs.is_active }}
+      test_build: ${{ env.TEST_BUILD }}
+      target_name: ${{ env.TARGET_NAME }}
+      fake_build: ${{ env.FAKE_BUILD }}
     steps:
       - name: Get repo data via GH API
         id: gh
@@ -124,6 +157,12 @@ jobs:
           - tuf_ax4200
           - tuf_ax6000
           - zen-bt8
+        isTest:
+          - ${{ needs.check.outputs.test_build == 'true' }}
+        exclude:
+          - { isTest: true }
+        include:
+          - target: ${{ github.event.inputs.target_name }}
     steps:
       - name: Initialization environment
         env:
@@ -131,7 +170,10 @@ jobs:
         run: |
           sudo apt-get -qq update
           #sudo apt-get -qq update && sudo apt-get -qq upgrade
-          sudo apt-get -qq install $(cat $DEPENDENCIES)
+          sudo apt-get -qq install  build-essential gawk flex rsync swig unzip zlib1g-dev file wget
+          sudo apt-get -qq install  libc6-dev clang flex bison g++ gcc-multilib g++-multilib
+          sudo apt-get -qq install  gettext git libncurses5-dev libssl-dev python3-setuptools
+          sudo apt-get -qq install  libc6-dev pkg-config
           sudo apt-get -qq autoremove --purge
           sudo apt-get -qq clean
           sudo timedatectl set-timezone "$TZ"
@@ -149,35 +191,40 @@ jobs:
         uses: actions/checkout@main
 
       - name: Download OpenWrt sources
-        run: git clone --branch $REPO_BRANCH $REPO_URL.git $BUILD_ROOT
+        run: |
+          git clone --branch $REPO_BRANCH $REPO_URL.git openwrt
+          rm -rf .git
+          rsync -a openwrt/ ./
+          rm -rf openwrt  
 
       - name: Init builder
-        env:
-          BLDROOT: ${{ github.workspace }}
-        shell: bash        
         run: |
-          rsync -avq --exclude=".*" --exclude="$(basename $BUILD_ROOT)" $BLDROOT/ $BUILD_ROOT/
-          cd $BUILD_ROOT
           chmod +x *.sh
-          wget https://github.com/fantastic-packages/packages/raw/refs/heads/24.10/keys/usign/53FF2B6672243D28.pub
+          wget https://github.com/fantastic-packages/packages/raw/refs/heads/25.12/keys/usign/53FF2B6672243D28.pub
+
+      - name: Cache downloads (dl)
+        if: false
+        uses: actions/cache@v4
+        with:
+          path: dl
+          key: dl-${{ hashFiles('feeds.conf.default') }}
+          restore-keys: |
+            dl-
 
       - name: Update OpenWrt packages
         id: update
         run: |
-          cd $BUILD_ROOT && ./xupdate.sh -f
+          ./xupdate.sh -f
+          mkdir -p logs
           echo "status=success" >> $GITHUB_OUTPUT
 
-      - name: Build the firmware image
+      - name: Configure
-        id: compile
+        id: configure
         if: steps.update.outputs.status == 'success'
         env: 
           TARGET: ${{ matrix.target }}
           FW_VER: ${{ needs.check.outputs.fw_ver }}
         run: |
-          cd $BUILD_ROOT
-          MAKE_JOBS=$(($(nproc)+1))
-          echo "$MAKE_JOBS thread compile"
-          # init build config
           ./xmake.sh -I -t $TARGET
           G_DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
           [ -z "$G_DEVICE_NAME" ] && exit 31
@@ -185,6 +232,8 @@ jobs:
           [ -z "$G_BOARD_NAME" ] && exit 32
           G_SUBTARGET_NAME=$( grep -so '^CONFIG_TARGET_SUBTARGET=.*' .config | cut -d'"' -f2 )
           [ -z "$G_SUBTARGET_NAME" ] && exit 33
+          G_TARGET_ARCH=$( grep -so '^CONFIG_TARGET_ARCH_PACKAGES=.*' .config | cut -d'"' -f2 )
+          echo "G_TARGET_ARCH = $G_TARGET_ARCH"
           VERMAGIC_LIST="vermagic-$G_BOARD_NAME-$G_SUBTARGET_NAME-*.list"
           if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
               ./vermagic_update.sh $G_BOARD_NAME $G_SUBTARGET_NAME
@@ -192,17 +241,125 @@ jobs:
           if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
               exit 41
           fi
-          # run build
-          [ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
-          # process results
           FILE_DATE=$(date --utc +'%y%m%d')
-          OUT_DIR=$BUILD_ROOT/bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
+          echo "status=success" >> $GITHUB_OUTPUT
+          echo "FW_VER=$FW_VER" >> $GITHUB_ENV
+          echo "G_DEVICE_NAME=$G_DEVICE_NAME" >> $GITHUB_ENV
+          echo "G_BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
+          echo "G_SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
+          echo "G_TARGET_ARCH=$G_TARGET_ARCH" >> $GITHUB_ENV
+          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
+
+      - name: Dump .config file
+        run: |
+          echo "====== .config ========="
+          cat .config
+          echo "========================"
+
+      - name: Prepare for use cache of tools and toolchain
+        run: |
+          echo "G_TARGET_ARCH = $G_TARGET_ARCH"
+          mkdir -p staging_dir/host
+          rm -rf /tmp/staging-host
+          mkdir -p /tmp/staging-host
+          cp -a staging_dir/host/* /tmp/staging-host/
+          rm -rf staging_dir/host/*
+    
+      - name: Cache host tools
+        uses: actions/cache@v4
+        with:
+          path: staging_dir/host
+          key: host-tools-${{ runner.os }}-${{ hashFiles('tools/**') }}
+          save-always: true
+          restore-keys: |
+            host-tools-${{ runner.os }}-
+
+      - name: Cache toolchain
+        if: false
+        uses: actions/cache@v4
+        with:
+          path: staging_dir/toolchain-*
+          key: toolchain-${{ env.G_TARGET_ARCH }}-${{ hashFiles('toolchain/**') }}
+          save-always: true
+          restore-keys: |
+            toolchain-${{ env.G_TARGET_ARCH }}-
+
+      - name: Restore saved host staging
+        run: |
+          cp -af /tmp/staging-host/* staging_dir/host
+          rm -rf /tmp/staging-host
+    
+      - name: Increase swap to 16G
+        if: false
+        run: |
+          free -h
+          sudo swapoff -a || true
+          sudo rm -f /swapfile
+          sudo fallocate -l 16G /swapfile
+          sudo chmod 600 /swapfile
+          sudo mkswap /swapfile
+          sudo swapon /swapfile
+    
+      - name: Monitor memory
+        run: |
+          echo "CPU cores = $(nproc)"
+          echo "Memory and swap:"
+          sudo free -h
+          echo
+          sudo swapon --show
+          echo
+          echo "Available storage:"
+          sudo df -h
+
+      - name: Build tools and toolchain
+        id: tools
+        if: ${{ steps.configure.outputs.status == 'success' && github.event.inputs.fake_build != 'true' }}
+        run: |
+          make toolchain/install -j$(nproc)
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Kernel compile
+        id: kernel
+        if: ${{ steps.tools.outputs.status == 'success' && github.event.inputs.first_kernel_compile == 'true' && github.event.inputs.fake_build != 'true' }}
+        run: |
+          make target/linux/compile -j$(nproc)
+          echo "status=success" >> $GITHUB_OUTPUT
+
+      - name: Monitor memory 2
+        run: |
+          echo "Memory and swap:"
+          sudo free -h
+          echo
+          sudo swapon --show
+          echo
+          echo "Available storage:"
+          sudo df -h
+
+      - name: Build the firmware image
+        id: compile
+        if: steps.tools.outputs.status == 'success'
+        env: 
+          TARGET: ${{ matrix.target }}
+        run: |
+          echo "Run $(nproc) thread compile"
+          if [ "$FAKE_BUILD" != "true" -a "$TEST_BUILD" = "true" -a "$PACKAGE_DIR" != "" ]; then
+              make $PACKAGE_DIR/compile V=sc BUILD_LOG=1
+              exit 99
+          fi
+          if [ "$FAKE_BUILD" != "true" ]; then
+              if [ "$TEST_BUILD" != "true" ]; then
+                  make -j$(nproc) download world
+              else
+                  make V=sc download world
+              fi
+          fi
+          # process results
+          OUT_DIR=bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
           if [ "$FAKE_BUILD" = "true" ]; then
               mkdir -p logs
               mkdir -p $OUT_DIR
               echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$OUT_DIR/$G_DEVICE_NAME.txt"
               touch "$OUT_DIR/kernel-debug.tar.zst"
-              ls -la
               BLD_VER=$FW_VER
           else
               BLD_VER=$( cat $OUT_DIR/profiles.json | grep -so '"version_number":"[^"]*' | grep -so '[^"]*$' )
@@ -213,24 +370,40 @@ jobs:
               exit 100
           fi
           echo "status=success" >> $GITHUB_OUTPUT
-          echo "DEVICE_NAME=$G_DEVICE_NAME" >> $GITHUB_ENV
+          echo "FW_BUILD_OK=1" >> $GITHUB_ENV
-          echo "BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
-          echo "SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
           echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
           echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
-          echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
+
+      - name: Mark firmware build failed
+        if: false # steps.compile.outcome == 'failure'
+        run: |
+          echo "Firmware build failed, continuing pipeline"
+          echo "FW_BUILD_OK=0" >> $GITHUB_ENV
+          OUT_DIR=_bin_fake
+          mkdir -p $OUT_DIR
+          echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$OUT_DIR/$G_DEVICE_NAME.txt"
+          touch "$OUT_DIR/kernel-debug.tar.zst"
+          echo "BUILD FAILED" > $OUT_DIR/FAILED.txt
+          echo "BLD_VER=$FW_VER" >> $GITHUB_ENV
+          echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
 
       - name: Check space usage
         run: df -hT
 
+      - name: Check OOM error
+        if: failure()
+        run: |
+          dmesg | grep -i -E 'oom|killed process' || true
+          echo "================== Memory ================="
+          free -h
+    
       - name: Compress build logs
         if: always()
         env:
           TARGET: ${{ matrix.target }}
           FW_DATE: ${{ needs.check.outputs.fw_date }}
-          LOGS_DIR: ${{ env.BUILD_ROOT }}/logs
         run: |
-          tar -cJvf logs-$TARGET-$FW_DATE.tar.xz $LOGS_DIR
+          tar -cJvf logs-$TARGET-$FW_DATE.tar.xz logs
 
       - name: Cleanup OUT directory 
         if: steps.compile.outputs.status == 'success'
@@ -255,7 +428,7 @@ jobs:
         uses: actions/upload-artifact@main
         if: steps.compile.outputs.status == 'success'
         with:
-          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.DEVICE_NAME }}
+          name: openwrt-${{ env.BLD_VER }}-${{ needs.check.outputs.build_date }}-${{ env.G_DEVICE_NAME }}
           path: ${{ env.OUT_DIR }}
           if-no-files-found: error
 
@@ -279,6 +452,16 @@ jobs:
         with:
           pattern: openwrt-*
 
+      - name: Check for failed builds
+        run: |
+          echo "Checking for FAILED.txt in openwrt-* directories..."
+          FAILED_DIRS=$( find . -maxdepth 1 -type d -name 'openwrt-*' -exec test -f '{}/FAILED.txt' \; -print )
+          if [ -n "$FAILED_DIRS" ]; then
+            echo "❌ Build failures detected in:"
+            exit 201
+          fi
+          echo "✅ No FAILED.txt found, proceeding to release"
+    
       - name: Put images into zip
         run: |
           mkdir -p public
@@ -291,8 +474,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ needs.check.outputs.tag }}
         with:
-          prerelease: false
+          prerelease: ${{ env.TEST_BUILD == 'true' || env.FAKE_BUILD == 'true' }}
-          tag_name: ${{ needs.check.outputs.tag }}
+          tag_name: ${{ needs.check.outputs.tag }}${{ env.TAG_SUFFIX }}
           name: '${{ needs.check.outputs.tag }}'
           body: |
             OpenWrt ${{ needs.check.outputs.fw_ver }} [${{ needs.check.outputs.fw_date }}]

_addons.config

@@ -13,16 +13,16 @@ CONFIG_FEED__alpine_fan_control=m
 #GIT_PACKAGE luci-app-temp-status=https://github.com/openwrt-xiaomi/luci-app-temp-status.git master
 
 ### luci-app-disks-info
-#GIT_PACKAGE luci-app-disks-info=https://github.com/openwrt-xiaomi/luci-app-disks-info.git master
+#GIT_PACKAGE luci-app-disks-info=https://github.com/gSpotx2f/luci-app-disks-info.git master
 
 ### luci-app-diskman
-#GIT_PACKAGE luci-app-diskman=https://github.com/openwrt-xiaomi/luci-app-diskman.git master
+#GIT_PACKAGE luci-app-diskman=https://github.com/lisaac/luci-app-diskman.git master
 
 ### luci-theme-argon
-#GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master
+#GIT_PACKAGE luci-theme-argon=https://github.com/jerrykuku/luci-theme-argon.git master
 
 ### luci-app-argon-config
-#GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master
+#GIT_PACKAGE luci-app-argon-config=https://github.com/jerrykuku/luci-app-argon-config.git master
 
 ### luci-app-tn-netports
 #GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master
@@ -46,9 +46,9 @@ CONFIG_FEED__alpine_fan_control=m
 CONFIG_FEED__amneziawg=m
 
 ### Zapret
-#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git zap1
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git;zap1
 CONFIG_FEED__zapret=m
-#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git master
+#GIT_FEED _zapret2=https://github.com/remittor/zapret-openwrt.git;master
 CONFIG_FEED__zapret2=m
 
 ### ruantiblock

xmake.sh

@@ -144,8 +144,29 @@ function build_target {
 		sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
 	fi
 
-	DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
+	DROPBEAR_DIR=$XDIR/package/network/services/dropbear
+	TMP_DROPBEAR_DIR=$XDIR/_dropbear2024
 	if [ -f $DROPBEAR_MK ]; then
+		# download dropbear 2024.86 (OpenWrt v24.10)
+		if [ ! -f $TMP_DROPBEAR_DIR/Makefile ]; then
+			rm -rf $TMP_DROPBEAR_DIR
+			git clone --depth 1 --filter=blob:none --sparse https://github.com/openwrt/openwrt.git $TMP_DROPBEAR_DIR && (
+				cd $TMP_DROPBEAR_DIR
+				git sparse-checkout set package/network/services/dropbear
+				git checkout a2f0cd35ac1d15e69f4897b35c049e175dd06825 # commit 2024-12-12 https://github.com/openwrt/openwrt/commits/openwrt-25.12/package/network/services/dropbear
+				mv package/network/services/dropbear/* .
+			)
+			rm -rf $TMP_DROPBEAR_DIR/package
+			rm -rf $TMP_DROPBEAR_DIR/.git
+		fi
+		rm -rf $DROPBEAR_DIR/files
+		rm -rf $DROPBEAR_DIR/patches
+	fi
+	DROPBEAR_MK=$DROPBEAR_DIR/Makefile
+	if [ -f $DROPBEAR_MK ]; then
+		# downgrade dropbear to 2024.86 (OpenWrt v24.10)
+		cp -a $TMP_DROPBEAR_DIR/. $DROPBEAR_DIR/
+		# patch: Disable MODERN and enable RSA/DH-SHA1
 		sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
 		sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
 		sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
@@ -280,7 +301,7 @@ function build_target {
 		echo "src/gz  fantastic_packages_special   $PKG_LINK/special"   >> $OPKG_CFEED_FN
 		TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
 		[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
-		sed -i "s/<<VER>>/24.10/g" $OPKG_CFEED_FN
+		sed -i "s/<<VER>>/25.12/g" $OPKG_CFEED_FN
 		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $OPKG_CFEED_FN
 		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/packages]"
 	fi