Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Travis CI script to checkout particular commits of external tests

Browse source
This commit is contained in:
Jon Siwek 2018-08-21 16:47:52 -05:00
parent 553ce6aca1
commit ef3d451af3
6 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
.update-changes.cfg Normal file
View file

@ -0,0 +1,19 @@
function new_version_hook
{
# This can be used to automatically adapt version numbers in files,
# except it's not used for that currently. Instead it updates the files
# which store the commit hashes associated with the version of external
# test suite repos to check out on a CI system.
version=$1
if [ -d testing/external/bro-testing ]; then
( cd testing/external/bro-testing && git rev-parse HEAD ) > testing/external/commit-hash.bro-testing
git add testing/external/commit-hash.bro-testing
fi
if [ -d testing/external/bro-testing-private ]; then
( cd testing/external/bro-testing-private && git rev-parse HEAD ) > testing/external/commit-hash.bro-testing-private
git add testing/external/commit-hash.bro-testing-private
fi
}

7
CHANGES
View file

@ -1,4 +1,11 @@
2.5-890 | 2018-08-21 16:47:52 -0500
* Fix Travis CI script to checkout particular commits of external tests
(Jon Siwek, Corelight)
* Fix signed/unsigned comparison warning (Jon Siwek, Corelight)
2.5-888 | 2018-08-21 15:54:56 -0500 2.5-888 | 2018-08-21 15:54:56 -0500
* Add --with-broker configure option (Jon Siwek, Corelight) * Add --with-broker configure option (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.5-888 2.5-890

1
testing/external/commit-hash.bro-testing vendored Normal file
View file

@ -0,0 +1 @@
489007e9bd035777cd1d33a9e1db9857449f805b

1
testing/external/commit-hash.bro-testing-private vendored Normal file
View file

@ -0,0 +1 @@
ec454469578db00176db08a60363e99cdf1867f3

8
testing/scripts/travis-job
View file

@ -198,10 +198,18 @@ run() {
make init make init
fi fi
if [ -d bro-testing ]; then
( cd bro-testing && git checkout `cat ../commit-hash.bro-testing` )
fi
if [ ! -d bro-testing-private ]; then if [ ! -d bro-testing-private ]; then
get_private_tests get_private_tests
fi fi
if [ -d bro-testing-private ]; then
( cd bro-testing-private && git checkout `cat ../commit-hash.bro-testing-private` )
fi
echo echo
echo "Running external tests ##############################################" echo "Running external tests ##############################################"
echo echo