diff --git a/.cirrus.yml b/.cirrus.yml index 0edc2e6e..3af243e0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -90,7 +90,7 @@ task: CI_NAME: "cirrus-ci" CI_BUILD_NUMBER: "${CIRRUS_BUILD_ID}" CI_BUILD_URL: "${CIRRUS_REPO_CLONE_URL}" - CI_BRANCH: "${CIRRUS_BASE_BRANCH}" + CI_BRANCH: "${CIRRUS_BRANCH}" CI_PULL_REQUEST: "${CIRRUS_PR}" CONFIG_OPTS: "--enable-debug --disable-shared --enable-code-coverage --enable-tests" diff --git a/ci/covupload.sh b/ci/covupload.sh index 82059df6..3185513e 100755 --- a/ci/covupload.sh +++ b/ci/covupload.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e if [ "$BUILD_TYPE" = "coverage" ]; then echo "CI_NAME=${CI_NAME}" @@ -6,6 +6,7 @@ if [ "$BUILD_TYPE" = "coverage" ]; then echo "CI_BUILD_URL=${CI_BUILD_URL}" echo "CI_BRANCH=${CI_BRANCH}" echo "CI_PULL_REQUEST=${CI_PULL_REQUEST}" - export PATH="$PATH:~/.local/bin" + PATH="${PATH}:/root/.local/bin:~/.local/bin" + export PATH coveralls --gcov-options '\-lp' fi