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.
This commit is contained in:
parent
00f2f20c2f
commit
a995b81e97
2
.github/workflows/build-openwrt-packages.yml
vendored
2
.github/workflows/build-openwrt-packages.yml
vendored
@ -194,7 +194,7 @@ jobs:
|
|||||||
build-essential clang flex bison g++ gawk \
|
build-essential clang flex bison g++ gawk \
|
||||||
gcc-multilib g++-multilib gettext git libncurses5-dev \
|
gcc-multilib g++-multilib gettext git libncurses5-dev \
|
||||||
libssl-dev python3-setuptools python3-dev rsync \
|
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
|
- name: Cache OpenWrt SDK
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
|
|||||||
2
.github/workflows/build-secubox-images.yml
vendored
2
.github/workflows/build-secubox-images.yml
vendored
@ -148,7 +148,7 @@ jobs:
|
|||||||
build-essential clang flex bison g++ gawk \
|
build-essential clang flex bison g++ gawk \
|
||||||
gcc-multilib g++-multilib gettext git libncurses5-dev \
|
gcc-multilib g++-multilib gettext git libncurses5-dev \
|
||||||
libssl-dev python3-setuptools python3-dev rsync \
|
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
|
- name: Clone OpenWrt
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@ -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 \
|
sudo apt-get install -y build-essential clang flex bison g++ gawk \
|
||||||
gcc-multilib g++-multilib gettext git libncurses5-dev \
|
gcc-multilib g++-multilib gettext git libncurses5-dev \
|
||||||
libssl-dev python3-setuptools python3-dev rsync \
|
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
|
# Optional for validation
|
||||||
sudo apt-get install -y shellcheck nodejs
|
sudo apt-get install -y shellcheck nodejs
|
||||||
|
|||||||
@ -117,7 +117,7 @@ check_dependencies() {
|
|||||||
local missing_deps=()
|
local missing_deps=()
|
||||||
|
|
||||||
# Build tools
|
# 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
|
if ! command -v "$cmd" &> /dev/null; then
|
||||||
missing_deps+=("$cmd")
|
missing_deps+=("$cmd")
|
||||||
fi
|
fi
|
||||||
@ -137,7 +137,7 @@ check_dependencies() {
|
|||||||
echo " sudo apt-get install -y build-essential clang flex bison g++ gawk \\"
|
echo " sudo apt-get install -y build-essential clang flex bison g++ gawk \\"
|
||||||
echo " gcc-multilib g++-multilib gettext git libncurses5-dev \\"
|
echo " gcc-multilib g++-multilib gettext git libncurses5-dev \\"
|
||||||
echo " libssl-dev python3-setuptools python3-dev rsync \\"
|
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 ""
|
||||||
echo "For validation tools:"
|
echo "For validation tools:"
|
||||||
echo " sudo apt-get install -y shellcheck nodejs"
|
echo " sudo apt-get install -y shellcheck nodejs"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user