diff options
| author | Jack Lloyd <[email protected]> | 2016-10-18 20:18:38 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-10-18 20:18:38 -0400 |
| commit | 6803f5a73ba76bfceb4ab7d9952932d6e38b2e6b (patch) | |
| tree | b9a4f1226c8be762c7dda61c5266b0045d2b57c0 | |
| parent | 8f1ecd838eb05ad71bcfeb8cc59873c6f4f903ba (diff) | |
Add BSI specific Travis build
Unfortunately something that is enabled in BSI but not 'modern' policy
takes ages to run under qemu and causes Travis timeouts, so revert back
to the old policy for the ARM builds. GH #667
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 7591299a1..145a98c9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ env: matrix: - BUILD_MODE="shared" - BUILD_MODE="static" + - BUILD_MODE="bsi" - BUILD_MODE="mini-shared" - BUILD_MODE="mini-static" - BUILD_MODE="cross-arm32" diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 9a4ae6375..53c8df15a 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -17,6 +17,8 @@ if [ "$BUILD_MODE" = "static" ] || [ "$BUILD_MODE" = "mini-static" ]; then elif [ "$BUILD_MODE" = "shared" ] || [ "$BUILD_MODE" = "mini-shared" ]; then # No special flags required for shared lib build CFG_FLAGS+=() +elif [ "$BUILD_MODE" = "bsi" ]; then + CFG_FLAGS+=(--module-policy=bsi) elif [ "$BUILD_MODE" = "sonarqube" ]; then # No special flags required CFG_FLAGS+=() @@ -76,12 +78,12 @@ if [ "${BUILD_MODE:0:6}" = "cross-" ]; then CC_BIN=arm-linux-gnueabihf-g++-4.8 TEST_PREFIX="qemu-arm -L /usr/arm-linux-gnueabihf/" CFG_FLAGS+=(--cpu=armv7) - CFG_FLAGS+=(--module-policy=bsi --enable-modules=tls) + CFG_FLAGS+=(--module-policy=modern --enable-modules=tls) elif [ "$BUILD_MODE" = "cross-arm64" ]; then CC_BIN=aarch64-linux-gnu-g++-4.8 TEST_PREFIX="qemu-aarch64 -L /usr/aarch64-linux-gnu/" CFG_FLAGS+=(--cpu=armv8-a) - CFG_FLAGS+=(--module-policy=bsi --enable-modules=tls) + CFG_FLAGS+=(--module-policy=modern --enable-modules=tls) elif [ "$BUILD_MODE" = "cross-ppc32" ]; then CC_BIN=powerpc-linux-gnu-g++-4.8 TEST_PREFIX="qemu-ppc -L /usr/powerpc-linux-gnu/" |