Merge pull request #260 from wilzbach/coverage

Run CodeCov on Buildkite
merged-on-behalf-of: Sebastian Wilzbach <[email protected]>

Author: dlang-bot

buildkite.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 
-cat << 'EOF'
-steps:
-  - command: |
-        echo "--- Print environment"
-        uname -a
-        make --version
-        \${SHELL} --version || true
-        c++ --version
-        ld -v
-        ! command -v gdb &>/dev/null || gdb --version
-        ! dmd --version # ensure that no dmd is the current environment
+read -r -d '' LOAD_CI_FOLDER <<- EOM
         echo "--- Load CI folder"
         # just to be sure there isn't anything old left
         git clean -ffdxq .
@@ -21,6 +11,20 @@ steps:
            tar xvfz master.tar.gz --strip-components=2 ci-master/buildkite
            rm -rf master.tar.gz && popd
         fi
+EOM
+
+cat << EOF
+steps:
+  - command: |
+        echo "--- Print environment"
+        uname -a
+        make --version
+        \\\${SHELL} --version || true
+        c++ --version
+        ld -v
+        ! command -v gdb &>/dev/null || gdb --version
+        ! dmd --version # ensure that no dmd is the current environment
+        ${LOAD_CI_FOLDER}
         ./buildkite/build_distribution.sh
     label: "Build"
     artifact_paths: "distribution.tar.xz"
@@ -36,7 +40,7 @@ cat << 'EOF'
 EOF
 
 ################################################################################
-# Style targets
+# Style & coverage targets
 # Must run after the 'wait' to avoid blocking the build_distribution step
 # (and thus all subsequent project builds)
 ################################################################################
@@ -47,10 +51,17 @@ case "${BUILDKITE_REPO:-x}" in
     "https://github.com/dlang/phobos.git")
 
 cat << 'EOF'
-steps:
   - command: |
         make -f posix.mak style
     label: "Style"
+
+  - command: |
+        ${LOAD_CI_FOLDER}
+        ./buildkite/test_coverage.sh
+    label: "Coverage"
+    retry:
+      automatic:
+        limit: 2
 EOF
         ;;
     *)

buildkite/build_distribution.sh

@@ -8,46 +8,7 @@ echo "--- Setting build variables"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-origin_repo="$(echo "$BUILDKITE_REPO" | sed "s/.*\/\([^\]*\)[.]git/\1/")"
-origin_target_branch="$BUILDKITE_PULL_REQUEST_BASE_BRANCH"
-if [ -z "$origin_target_branch" ] ; then
-  origin_target_branch="$BUILDKITE_BRANCH"
-fi
-echo "origin_target_branch: $origin_target_branch"
-
-echo "--- Cloning all core repositories"
-repositories=(dmd druntime phobos tools dub)
-for dir in "${repositories[@]}" ; do
-    if [ "$origin_repo" == "$dir" ] ; then
-      # we have already cloned this repo, so let's use this data
-        mkdir -p "$dir"
-        for f in ./* ; do
-            case "$f" in
-                ./.git) ;;
-                ./buildkite) ;;
-                "./${dir}") ;;
-                *)
-                    mv "$f" "$dir"
-                    ;;
-            esac
-        done
-    fi
-done
-for dir in "${repositories[@]}" ; do
-    if [ "$origin_repo" != "$dir" ] ; then
-        if [ "$origin_target_branch" == "master" ] || [ "$origin_target_branch" == "stable" ] ; then
-            branch="$origin_target_branch"
-        else
-            branch=$(git ls-remote --exit-code --heads "https://github.com/dlang/$dir" "${origin_target_branch}" > /dev/null && echo "$origin_target_branch" || echo "master")
-        fi
-        git clone -b "${branch:-master}" --depth 1 "https://github.com/dlang/$dir"
-    fi
-done
-
-for dir in dmd druntime phobos ; do
-    echo "--- Building $dir"
-    make -C $dir -f posix.mak AUTO_BOOTSTRAP=1 --jobs=4
-done
+"$DIR/clone_repositories.sh"
 
 echo "--- Building dub"
 cd dub

buildkite/clone_repositories.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+PS4="~> " # needed to avoid accidentally generating collapsed output
+set -uexo pipefail
+
+# Builds DMD, DRuntime, Phobos, tools and DUB + creates a "distribution" archive for latter usage.
+echo "--- Setting build variables"
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+origin_repo="$(echo "$BUILDKITE_REPO" | sed "s/.*\/\([^\]*\)[.]git/\1/")"
+origin_target_branch="$BUILDKITE_PULL_REQUEST_BASE_BRANCH"
+if [ -z "$origin_target_branch" ] ; then
+  origin_target_branch="$BUILDKITE_BRANCH"
+fi
+echo "origin_target_branch: $origin_target_branch"
+
+echo "--- Cloning all core repositories"
+repositories=(dmd druntime phobos tools dub)
+for dir in "${repositories[@]}" ; do
+    if [ "$origin_repo" == "$dir" ] ; then
+    # we have already cloned this repo, so let's use this data
+        mkdir -p "$dir"
+        for f in ./* ; do
+            case "$f" in
+                ./.git) ;;
+                ./buildkite) ;;
+                "./${dir}") ;;
+                *)
+                    mv "$f" "$dir"
+                    ;;
+            esac
+        done
+    fi
+done
+
+for dir in "${repositories[@]}" ; do
+    if [ "$origin_repo" != "$dir" ] ; then
+        if [ "$origin_target_branch" == "master" ] || [ "$origin_target_branch" == "stable" ] ; then
+            branch="$origin_target_branch"
+        else
+            branch=$(git ls-remote --exit-code --heads "https://github.com/dlang/$dir" "${origin_target_branch}" > /dev/null && echo "$origin_target_branch" || echo "master")
+        fi
+        git clone -b "${branch:-master}" --depth 1 "https://github.com/dlang/$dir"
+    fi
+done
+
+for dir in dmd druntime phobos ; do
+    echo "--- Building $dir"
+    make -C $dir -f posix.mak AUTO_BOOTSTRAP=1 --jobs=4
+done

buildkite/test_coverage.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PS4="~> " # needed to avoid accidentally generating collapsed output
+set -uexo pipefail
+
+echo "--- Setting build variables"
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+N=2
+MODEL=64
+PIC=1
+
+"$DIR/clone_repositories.sh"
+
+echo "--- Running the testsuite with COVERAGE=1"
+
+origin_repo="$(echo "$BUILDKITE_REPO" | sed "s/.*\/\([^\]*\)[.]git/\1/")"
+cd "$origin_repo"
+
+if [ -f coverage.sh ] ; then
+    wget "https://codecov.io/bash" -O codecov.sh
+    ./coverage.sh
+else
+    echo "WARNING: no coverage.sh script found."
+fi