diff options
| author | Kai Engert <kaie@kuix.de> | 2017-09-18 14:09:06 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2017-09-18 14:09:06 +0200 |
| commit | fd6b8e9dec4fdfd159be69e4a051f562ffdfd52b (patch) | |
| tree | 0397aa48928a1025d212ac4d996d03f1c4f9c0e2 /automation | |
| parent | 9031c33fc7b14ac37f0b81c4b7cbfb0123964a3c (diff) | |
| download | nss-hg-fd6b8e9dec4fdfd159be69e4a051f562ffdfd52b.tar.gz | |
Bug 1399858, NSS buildbot ABI check script fails if NSPR version on previous branch is unreleased, r=fkiefer
Diffstat (limited to 'automation')
| -rwxr-xr-x | automation/buildbot-slave/build.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/automation/buildbot-slave/build.sh b/automation/buildbot-slave/build.sh index 3fc914803..e30f78d1d 100755 --- a/automation/buildbot-slave/build.sh +++ b/automation/buildbot-slave/build.sh @@ -236,11 +236,14 @@ check_abi() BASE_NSPR=NSPR_$(head -1 ${HGDIR}/baseline/nss/automation/release/nspr-version.txt | cut -d . -f 1-2 | tr . _)_BRANCH hg clone -u "${BASE_NSPR}" "${HGDIR}/nspr" "${HGDIR}/baseline/nspr" if [ $? -ne 0 ]; then - echo "invalid tag ${BASE_NSPR} derived from ${BASE_NSS} automation/release/nspr-version.txt" - return 1 + echo "nonexisting tag ${BASE_NSPR} derived from ${BASE_NSS} automation/release/nspr-version.txt" + # Assume that version hasn't been released yet, fall back to trunk + pushd "${HGDIR}/baseline/nspr" + hg update default + popd fi - print_log "######## building older NSPR/NSS ########" + print_log "######## building baseline NSPR/NSS ########" pushd ${HGDIR}/baseline/nss print_log "$ ${MAKE} ${NSS_BUILD_TARGET}" |