From a995b81e97b58b39c9d4134dffac46b5398f09af Mon Sep 17 00:00:00 2001 From: CyberMind-FR Date: Sun, 28 Dec 2025 03:25:32 +0100 Subject: [PATCH] fix(ci): add ninja-build to dependencies in all build workflows - Add ninja-build to package build workflow (build-openwrt-packages.yml) - Add ninja-build to image build workflow (build-secubox-images.yml) - Update secubox-tools/README.md with ninja-build dependency - Update secubox-tools/local-build.sh dependency check and install instructions - Ninja is required by OpenWrt build system for some compilation tasks This resolves missing ninja errors in GitHub Actions builds. --- .github/workflows/build-openwrt-packages.yml | 2 +- .github/workflows/build-secubox-images.yml | 2 +- secubox-tools/README.md | 2 +- secubox-tools/local-build.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-openwrt-packages.yml b/.github/workflows/build-openwrt-packages.yml index 758c6b5d..ca2fd128 100644 --- a/.github/workflows/build-openwrt-packages.yml +++ b/.github/workflows/build-openwrt-packages.yml @@ -194,7 +194,7 @@ jobs: build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses5-dev \ libssl-dev python3-setuptools python3-dev rsync \ - swig unzip zlib1g-dev file wget curl jq + swig unzip zlib1g-dev file wget curl jq ninja-build - name: Cache OpenWrt SDK uses: actions/cache@v4 diff --git a/.github/workflows/build-secubox-images.yml b/.github/workflows/build-secubox-images.yml index e2da53c3..f2b78ee4 100644 --- a/.github/workflows/build-secubox-images.yml +++ b/.github/workflows/build-secubox-images.yml @@ -148,7 +148,7 @@ jobs: build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses5-dev \ libssl-dev python3-setuptools python3-dev rsync \ - swig unzip zlib1g-dev file wget curl qemu-utils + swig unzip zlib1g-dev file wget curl qemu-utils ninja-build - name: Clone OpenWrt run: | diff --git a/secubox-tools/README.md b/secubox-tools/README.md index 7c495c71..3445d274 100644 --- a/secubox-tools/README.md +++ b/secubox-tools/README.md @@ -74,7 +74,7 @@ Build and test packages locally without pushing to GitHub. Automatically downloa sudo apt-get install -y build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses5-dev \ libssl-dev python3-setuptools python3-dev rsync \ - swig unzip zlib1g-dev file wget curl jq + swig unzip zlib1g-dev file wget curl jq ninja-build # Optional for validation sudo apt-get install -y shellcheck nodejs diff --git a/secubox-tools/local-build.sh b/secubox-tools/local-build.sh index efc54797..b727386a 100755 --- a/secubox-tools/local-build.sh +++ b/secubox-tools/local-build.sh @@ -117,7 +117,7 @@ check_dependencies() { local missing_deps=() # Build tools - for cmd in make gcc g++ git wget curl tar xz jq; do + for cmd in make gcc g++ git wget curl tar xz jq ninja; do if ! command -v "$cmd" &> /dev/null; then missing_deps+=("$cmd") fi @@ -137,7 +137,7 @@ check_dependencies() { echo " sudo apt-get install -y build-essential clang flex bison g++ gawk \\" echo " gcc-multilib g++-multilib gettext git libncurses5-dev \\" echo " libssl-dev python3-setuptools python3-dev rsync \\" - echo " swig unzip zlib1g-dev file wget curl jq" + echo " swig unzip zlib1g-dev file wget curl jq ninja-build" echo "" echo "For validation tools:" echo " sudo apt-get install -y shellcheck nodejs"