Browse Source

Merge pull request #9659 from ynezz/upstream/ci-improvements

CI fixes and improvement
lilik-openwrt-22.03
champtar 5 years ago
committed by GitHub
parent
commit
49703ff7d4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
  1. +2
    -0
      .circleci/Dockerfile
  2. +11
    -2
      .circleci/config.yml

+ 2
- 0
.circleci/Dockerfile View File

@ -6,6 +6,7 @@ FROM debian:9
# v1.0.1 - Run as non-root, add unzip, xz-utils # v1.0.1 - Run as non-root, add unzip, xz-utils
# v1.0.2 - Add bzr # v1.0.2 - Add bzr
# v1.0.3 - Verify usign signatures # v1.0.3 - Verify usign signatures
# v1.0.4 - Add support for Python3
RUN apt update && apt install -y \ RUN apt update && apt install -y \
build-essential \ build-essential \
@ -18,6 +19,7 @@ git \
libncurses5-dev \ libncurses5-dev \
libssl-dev \ libssl-dev \
python \ python \
python3 \
signify-openbsd \ signify-openbsd \
subversion \ subversion \
time \ time \


+ 11
- 2
.circleci/config.yml View File

@ -2,7 +2,7 @@ version: 2.0
jobs: jobs:
build: build:
docker: docker:
- image: docker.io/openwrtorg/packages-cci:v1.0.3
- image: docker.io/openwrtorg/packages-cci:v1.0.4
environment: environment:
- SDK_HOST: "downloads.openwrt.org" - SDK_HOST: "downloads.openwrt.org"
- SDK_PATH: "snapshots/targets/ath79/generic" - SDK_PATH: "snapshots/targets/ath79/generic"
@ -94,6 +94,11 @@ jobs:
working_directory: ~/build_dir working_directory: ~/build_dir
command: | command: |
tar Jxf ~/sdk/$SDK_FILE --strip=1 tar Jxf ~/sdk/$SDK_FILE --strip=1
touch .config
make prepare-tmpinfo scripts/config/conf
./scripts/config/conf --defconfig=.config Config.in
make prereq
rm .config
cat > feeds.conf <<EOF cat > feeds.conf <<EOF
src-git base https://github.com/openwrt/openwrt.git;$BRANCH src-git base https://github.com/openwrt/openwrt.git;$BRANCH
src-link packages $HOME/openwrt_packages src-link packages $HOME/openwrt_packages
@ -145,7 +150,11 @@ jobs:
for PKG in $PKGS ; do for PKG in $PKGS ; do
echo_blue "===+ Building: $PKG" echo_blue "===+ Building: $PKG"
make "package/$PKG/compile" -j3 V=s
make "package/$PKG/compile" -j3 V=s || {
RET=$?
echo_red "===+ Building: $PKG failed, rebuilding with -j1 for human readable error log"
make "package/$PKG/compile" -j1 V=s; exit $RET
}
done done
- store_artifacts: - store_artifacts:


Loading…
Cancel
Save