From 7feae084b1be7f4fee424bfa4a76631ec1af37de Mon Sep 17 00:00:00 2001 From: Max Dymond Date: Wed, 24 Jul 2019 10:50:21 +0100 Subject: [PATCH] Use the correct branch for OSS Fuzz as well. --- test/ossfuzz/travisoss.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/ossfuzz/travisoss.sh b/test/ossfuzz/travisoss.sh index 9fdcb2f..ddcfa07 100755 --- a/test/ossfuzz/travisoss.sh +++ b/test/ossfuzz/travisoss.sh @@ -21,13 +21,15 @@ if [[ ${TRAVIS_PULL_REQUEST} != "false" ]] then # Pull-request branch REPO=${TRAVIS_PULL_REQUEST_SLUG} + BRANCH=${TRAVIS_PULL_REQUEST_BRANCH} else # Push build. REPO=${TRAVIS_REPO_SLUG} + BRANCH=${TRAVIS_BRANCH} 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/${REPO}.git@" /tmp/ossfuzz/projects/${PROJECT_NAME}/Dockerfile +sed -i "s@https://github.com/akheron/jansson.git@-b ${BRANCH} https://github.com/${REPO}.git@" /tmp/ossfuzz/projects/${PROJECT_NAME}/Dockerfile # Try and build the fuzzers pushd /tmp/ossfuzz