apache/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-05-09 06:42:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

CI: Improved speed to build nuttx on MSYS2 job

Browse Source 
After MSYS2 updated the package on GitHub
there was a slowdown in building NuttX in the MSYS2 job.

It went from an average of 6 minutes to 10 minutes !!!

The purpose of this PR is to speed up the build to decrease the usage of the Windows runner.

Modified Files
tools/ci/cibuild.sh

tools/sethost.sh

make olddefconfig -j 4 -> make olddefconfig
workaround for remove
  Cleaning...
  Configuring...
make[3]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
make[3]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
make[3]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.

Signed-off-by: simbit18 <simbit18@gmail.com>
This commit is contained in:
simbit18 2025-03-25 12:03:43 +01:00 committed by Xiang Xiao
parent 3844b43afe
commit d7681cc815
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/ci/cibuild.sh
View File

@ -20,10 +20,10 @@
# under the License. # under the License.
# #
############################################################################ ############################################################################
set -e set -e
set -o xtrace set -o xtrace
CID=$(cd "$(dirname "$0")" && pwd) CID=$(cd "$(dirname "$0")" && pwd)
CIWORKSPACE=$(cd "${CID}"/../../../ && pwd -P) CIWORKSPACE=$(cd "${CID}"/../../../ && pwd -P)
CIPLAT=${CIWORKSPACE}/nuttx/tools/ci/platforms CIPLAT=${CIWORKSPACE}/nuttx/tools/ci/platforms
@ -144,11 +144,7 @@ function run_builds {
ncpus=$(grep -c ^processor /proc/cpuinfo) ncpus=$(grep -c ^processor /proc/cpuinfo)
fi fi
if [ "X$osname" == "Xmsys2" ]; then
export MAKEFLAGS="-j"
else
options+="-j ${ncpus}" options+="-j ${ncpus}"
fi
for build in "${builds[@]}"; do for build in "${builds[@]}"; do
"${nuttx}"/tools/testbuild.sh ${options} -e "-Wno-cpp -Werror" "${build}" "${nuttx}"/tools/testbuild.sh ${options} -e "-Wno-cpp -Werror" "${build}"

4
tools/sethost.sh
View File

@ -228,4 +228,8 @@ fi
echo " Refreshing..." echo " Refreshing..."
if [ "X$wenv" == "Xmsys" ]; then
${MAKECMD} olddefconfig || { echo "ERROR: failed to refresh"; exit 1; }
else
${MAKECMD} olddefconfig $* || { echo "ERROR: failed to refresh"; exit 1; } ${MAKECMD} olddefconfig $* || { echo "ERROR: failed to refresh"; exit 1; }
fi