Utilize codecov/codecov-action@v3

Author: dfed

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: macOS-11
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version
@@ -24,7 +24,7 @@ jobs:
     runs-on: macOS-11
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version
@@ -54,9 +54,6 @@ jobs:
         run: Scripts/github/prepare-simulators.sh ${{ matrix.platforms }}
       - name: Build and Test Framework
         run: Scripts/build.swift ${{ matrix.platforms }}
-      - name: Upload Coverage Reports
-        if: success()
-        run: Scripts/upload-coverage-reports.sh ${{ matrix.platforms }}
   spm-12:
     name: Build Xcode 12
     runs-on: macOS-11
@@ -69,7 +66,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version
@@ -78,9 +75,11 @@ jobs:
         run: Scripts/github/prepare-simulators.sh ${{ matrix.platforms }}
       - name: Build and Test Framework
         run: Scripts/build.swift ${{ matrix.platforms }}
+      - name: Prepare Coverage Reports
+        run: ./Scripts/prepare-coverage-reports.sh
       - name: Upload Coverage Reports
         if: success()
-        run: Scripts/upload-coverage-reports.sh ${{ matrix.platforms }}
+        uses: codecov/codecov-action@v3
   spm-13:
     name: Build Xcode 13
     runs-on: macOS-12
@@ -93,7 +92,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version
@@ -102,15 +101,17 @@ jobs:
         run: Scripts/github/prepare-simulators.sh ${{ matrix.platforms }}
       - name: Build and Test Framework
         run: Scripts/build.swift ${{ matrix.platforms }}
+      - name: Prepare Coverage Reports
+        run: ./Scripts/prepare-coverage-reports.sh
       - name: Upload Coverage Reports
         if: success()
-        run: Scripts/upload-coverage-reports.sh ${{ matrix.platforms }}
+        uses: codecov/codecov-action@v3
   spm-13-swift:
     name: Swift Build Xcode 13
     runs-on: macOS-12
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version

Scripts/prepare-coverage-reports.sh

@@ -0,0 +1,45 @@
+#!/bin/zsh -l
+set -e
+
+root=$(git rev-parse --show-toplevel)
+
+function exportlcov() {
+    build_type=$1
+    executable=$2
+    profile=$3
+
+    can_proceed=true
+    if ! test -f $executable; then
+        echo "\tCould not find executable for $build_type"
+        can_proceed=false
+    fi
+
+    if ! test -f $profile; then
+        echo "\tCould not find profile for $build_type"
+        can_proceed=false
+    fi
+
+    if $can_proceed; then
+        output_dir=".build/artifacts/$build_type"
+        mkdir -p $output_dir
+
+        output_file="$output_dir/$(basename $executable).lcov"
+        echo "\tExporting $output_file"
+        xcrun llvm-cov export -format="lcov" $executable -instr-profile $profile > $output_file
+    else
+        echo "\tAborting creation of lcov file for $build_type"
+    fi
+}
+
+for directory in $root/.build/derivedData/*/; do
+    build_type=$(basename $directory)
+    echo "Finding coverage information for $build_type"
+
+    profile=$(find "${directory}" -type f -name 'Coverage.profdata')
+
+    cache_advance_tests_executable=$(find "${directory}" -type f -name 'CacheAdvanceTests')
+    exportlcov $build_type $cache_advance_tests_executable $profile
+
+    cad_cache_advance_tests_executable=$(find "${directory}" -type f -name 'CADCacheAdvanceTests')
+    exportlcov $build_type $cad_cache_advance_tests_executable $profile
+done

Scripts/upload-coverage-reports.sh

@@ -5,3 +5,8 @@ comment:
   layout: "reach,diff,flags,tree"
   behavior: default
   require_changes: no
+
+ignore:
+  - "Sources/LorumIpsum"
+  - "Sources/SwiftTryCatch"
+  - "Tests"