From a6f436fefca1240da23cfbd9db2a016e81014f0a Mon Sep 17 00:00:00 2001 From: Max Dymond Date: Wed, 24 Jul 2019 10:39:35 +0100 Subject: Ensure OSS fuzz travis builds work for PRs Use the correct repository for cloning when doing a push build or a pull-request. Only do one fuzzer build! --- test/ossfuzz/travisoss.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/ossfuzz/travisoss.sh b/test/ossfuzz/travisoss.sh index e99cc6e..9fdcb2f 100755 --- a/test/ossfuzz/travisoss.sh +++ b/test/ossfuzz/travisoss.sh @@ -16,8 +16,18 @@ then exit 0 fi +# Work out which repo to clone from, inside Docker +if [[ ${TRAVIS_PULL_REQUEST} != "false" ]] +then + # Pull-request branch + REPO=${TRAVIS_PULL_REQUEST_SLUG} +else + # Push build. + REPO=${TRAVIS_REPO_SLUG} +fi + # Modify the oss-fuzz Dockerfile so that we're checking out the current branch on travis. -sed -i "s@https://github.com/akheron/jansson.git@-b $TRAVIS_BRANCH https://github.com/akheron/jansson.git@" /tmp/ossfuzz/projects/${PROJECT_NAME}/Dockerfile +sed -i "s@https://github.com/akheron/jansson.git@-b ${TRAVIS_BRANCH} https://github.com/${REPO}.git@" /tmp/ossfuzz/projects/${PROJECT_NAME}/Dockerfile # Try and build the fuzzers pushd /tmp/ossfuzz -- cgit v1.1