Simplify codecov make and cmake configuration

Do not apt install unneeded packages, and commit coverage data even when the
build was not initiated by github.

Author: danpoe

buildspec-linux-cmake-gcc-cov.yml

@@ -13,8 +13,7 @@ phases:
       - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list
       - add-apt-repository ppa:ubuntu-toolchain-r/test
       - apt-get update -y
-      - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq lcov cmake curl gdb python-pip
-      - pip install codecov
+      - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq lcov cmake curl gdb
   build:
     commands:
       - echo Build started on `date`
@@ -23,11 +22,11 @@ phases:
       - cmake --build build --target coverage -- -j2
   post_build:
     commands:
-      - lcov --capture --directory build --output-file ./lcov.info
+      - lcov --capture --directory build --output-file lcov.info
       - VCS_PULL_REQUEST=$(echo $CODEBUILD_SOURCE_VERSION | sed 's/pr\///g')
       - COV_SCRIPT=/root/.cache/codecov.sh
       - if [ ! -f "$COV_SCRIPT" ]; then curl -s https://codecov.io/bash > "$COV_SCRIPT"; fi
-      - echo "$CODEBUILD_INITIATOR" | grep GitHub && bash "$COV_SCRIPT" -t "$CODECOV_TOKEN" || true
+      - bash "$COV_SCRIPT" -t "$CODECOV_TOKEN" || true
       - echo Build completed on `date`
 cache:
   paths:

buildspec-linux-make-gcc-cov.yml

@@ -12,8 +12,7 @@ phases:
     commands:
       - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list
       - apt-get update -y
-      - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb lcov curl python-pip
-      - pip install codecov
+      - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb lcov curl
   build:
     commands:
       - echo Build started on `date`
@@ -26,19 +25,22 @@ phases:
   post_build:
     commands:
       - make -C unit test 
+      # Also enable compilation with coverage/profiling flags when running the
+      # regression tests, to also get results for the driver program in
+      # regression/invariants
       - make -C regression test CPROVER_WITH_PROFILING=1
       - make -C regression/cbmc test-paths-lifo
       - env PATH=$PATH:`pwd`/src/solvers make -C regression/cbmc test-cprover-smt2
       - make -C jbmc/unit test
       - make -C jbmc/regression test
-      - lcov --capture --directory . --output-file ./lcov.info
+      - lcov --capture --directory . --output-file lcov.info
       # If $CODEBUILD_SOURCE_VERSION starts with 'pr/', filter out pr number, if not, return empty
       - VCS_PULL_REQUEST=$(echo $CODEBUILD_SOURCE_VERSION | sed '/^pr\//!d;s/^pr\///')
       # If $CODEBUILD_SOURCE_VERSION is commit id, set $VCS_COMMIT_ID
       - VCS_COMMIT_ID=$(echo $CODEBUILD_SOURCE_VERSION | sed -r '/^[a-z0-9]{40}$/!d') 
       - COV_SCRIPT=/root/.cache/codecov.sh
       - if [ ! -f "$COV_SCRIPT" ]; then curl -s https://codecov.io/bash > "$COV_SCRIPT"; fi
-      - echo "$CODEBUILD_INITIATOR" | grep GitHub && bash "$COV_SCRIPT" -t "$CODECOV_TOKEN" || true      
+      - bash $COV_SCRIPT -t "$CODECOV_TOKEN" || true
       - echo Build completed on `date`
 cache:
   paths: