Skip to content

Commit be823dc

Browse files
nashifAnas Nashif
authored andcommitted
ci: build commits, not only PR
Signed-off-by: Anas Nashif <[email protected]>
1 parent d7070b7 commit be823dc

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

.shippable.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,16 @@ build:
2323
- ${SHIPPABLE_BUILD_DIR}/ccache
2424
pre_ci_boot:
2525
image_name: zephyrprojectrtos/ci
26-
image_tag: master.27
26+
image_tag: v0.1
2727
pull: true
2828
options: "-e HOME=/home/buildslave --privileged=true --tty --net=bridge --user buildslave"
2929

3030
ci:
3131
- export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache
32-
- git rebase origin/${PULL_REQUEST_BASE_BRANCH}
32+
- >
33+
if [ "$IS_PULL_REQUEST" = "true" ]; then
34+
git rebase origin/${PULL_REQUEST_BASE_BRANCH};
35+
fi
3336
- source zephyr-env.sh
3437
- ccache -c -s --max-size=2000M
3538
- make host-tools
@@ -54,19 +57,20 @@ build:
5457
./scripts/ci/check-compliance.py --commits ${COMMIT_RANGE} || true;
5558
fi;
5659
- >
57-
sudo pip3 install sh;
58-
./scripts/ci/get_modified_tests.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_tests.args;
59-
./scripts/ci/get_modified_boards.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_boards.args;
60+
if [ "$IS_PULL_REQUEST" = "true" ]; then
61+
./scripts/ci/get_modified_tests.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_tests.args;
62+
./scripts/ci/get_modified_boards.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_boards.args;
6063
61-
if [ -s modified_boards.args ]; then
62-
./scripts/sanitycheck --subset ${MATRIX_BUILD}/${MATRIX_BUILDS_EXTRA} +modified_boards.args || ./scripts/sanitycheck +modified_boards.args --only-failed;
63-
cp ./scripts/sanity_chk/last_sanity.xml modified_boards.xml;
64-
fi;
65-
if [ -s modified_tests.args ]; then
66-
./scripts/sanitycheck --subset ${MATRIX_BUILD}/${MATRIX_BUILDS_EXTRA} +modified_tests.args || ./scripts/sanitycheck +modified_tests.args --only-failed
67-
cp ./scripts/sanity_chk/last_sanity.xml modified_tests.xml;
68-
fi;
69-
rm -f modified_tests.args modified_boards.args;
64+
if [ -s modified_boards.args ]; then
65+
./scripts/sanitycheck --subset ${MATRIX_BUILD}/${MATRIX_BUILDS_EXTRA} +modified_boards.args || ./scripts/sanitycheck +modified_boards.args --only-failed;
66+
cp ./scripts/sanity_chk/last_sanity.xml modified_boards.xml;
67+
fi;
68+
if [ -s modified_tests.args ]; then
69+
./scripts/sanitycheck --subset ${MATRIX_BUILD}/${MATRIX_BUILDS_EXTRA} +modified_tests.args || ./scripts/sanitycheck +modified_tests.args --only-failed;
70+
cp ./scripts/sanity_chk/last_sanity.xml modified_tests.xml;
71+
fi;
72+
rm -f modified_tests.args modified_boards.args;
73+
fi
7074
- >
7175
if [ "$MATRIX_BUILD" != "3" ]; then
7276
./scripts/sanitycheck ${PLATFORMS} --subset ${MATRIX_BUILD}/${MATRIX_BUILDS} ${COVERAGE} ${SANITYCHECK_OPTIONS} || ./scripts/sanitycheck ${PLATFORMS} ${COVERAGE} ${SANITYCHECK_OPTIONS_RETRY} || ./scripts/sanitycheck ${PLATFORMS} ${COVERAGE} ${SANITYCHECK_OPTIONS_RETRY}

0 commit comments

Comments
 (0)