diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59e8dbd..824509f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,10 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: "3.8" - name: Install Python dependencies - run: pip install openwisp-utils[qa]>=0.7 + run: pip install openwisp-utils[qa] - name: Install Development dependencies run: sudo ./install-dev.sh diff --git a/runbuild b/runbuild index 87e6e49..6815aa6 100755 --- a/runbuild +++ b/runbuild @@ -15,7 +15,7 @@ COMPILE_TARGET=${COMPILE_TARGET-mips_24kc} LATEST_LINK="$DOWNLOADS_DIR/latest" CORES=${CORES:-1} CURRENT_DIR=$(pwd) -OPENWRT_BRANCH="openwrt-21.02" +OPENWRT_BRANCH="openwrt-23.05" mkdir -p "$BUILD_DIR" mkdir -p "$VERSIONED_DIR" @@ -31,7 +31,7 @@ git checkout $OPENWRT_BRANCH git reset --hard origin/$OPENWRT_BRANCH # configure feeds -echo "src-git openwisp_config https://github.com/openwisp/openwisp-config.git^1.0.0" >feeds.conf +echo "src-git openwisp_config https://github.com/openwisp/openwisp-config.git^master" >feeds.conf echo "src-link openwisp_monitoring $CURRENT_DIR" >>feeds.conf cat feeds.conf.default >>feeds.conf # remove unneeded feeds @@ -51,7 +51,8 @@ if [ ! "$CI_CACHE" ]; then make -j"$CORES" toolchain/install fi -make -j"$CORES" package/openwisp-monitoring/compile || exit 1 +make -j"$CORES" package/openwisp-monitoring/compile || \ + make -j1 V=s package/openwisp-monitoring/compile || exit 1 mv "$BUILD_DIR/openwrt/bin/packages/$COMPILE_TARGET/openwisp_monitoring" "$VERSIONED_DIR"