chore: Using codecov bash to upload results (#3153)

Author: sebaland

.github/composite_actions/run_xcodebuild_test/action.yml

@@ -47,7 +47,7 @@ runs:
         coverageFlags=""
         if [ "${{ inputs.generate_coverage }}" == "true" ]; then
           echo "Code Coverage is enabled!"
-          coverageFlags+="-derivedDataPath Build/ -clonedSourcePackagesDirPath "~/Library/Developer/Xcode/DerivedData/$SCHEME" -enableCodeCoverage YES build test"
+          coverageFlags+="-derivedDataPath Build/ -clonedSourcePackagesDirPath "~/Library/Developer/Xcode/DerivedData/$SCHEME" -enableCodeCoverage YES"
         fi
         xcode-select -p
         xcodebuild -version
@@ -62,5 +62,5 @@ runs:
         cd $(ls -d */|head -n 1)
         pathCoverage=Build/Build/ProfileData/${PWD##*/}/Coverage.profdata
         cd ../../../../
-        xcrun llvm-cov export -format="lcov" -instr-profile $pathCoverage Build/Build/Products/Debug-iphonesimulator/$SCHEME.o > Coverage.lcov
+        xcrun llvm-cov export -format="lcov" -instr-profile $pathCoverage Build/Build/Products/Debug-${{ inputs.sdk }}/$SCHEME.o > Coverage.lcov
       shell: bash

.github/workflows/run_xcodebuild_test_platforms.yml

@@ -3,7 +3,7 @@ on:
   workflow_call:
     inputs:
       scheme:
-        description: 'The scheme to run the unit tests'
+        description: 'The scheme to run the tests'
         required: true
         type: string
       timeout-minutes:
@@ -20,7 +20,7 @@ on:
         description: 'What flag to include in the coverage report, separated by commas'
         required: false
         type: string
-        default: 'unittests'
+        default: 'tests'
 
 env:
   SCHEME: ${{ inputs.scheme }}
@@ -46,9 +46,9 @@ jobs:
           generate_coverage: ${{ inputs.submit_coverage_report }}
       - name: Upload Coverage report to Codecov
         if: ${{ inputs.submit_coverage_report == true }}
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
-        with:
-          flags: ${{ inputs.coverage_flags }}
+        shell: bash
+        run: |
+          build-support/codecov.sh -F '${{ inputs.coverage_flags }}'
 
   test-macOS:
     name: ${{ inputs.scheme }} macOS Tests

.github/workflows/unit_test.yml

@@ -29,25 +29,26 @@ jobs:
       submit_coverage_report: false
 
   unit-tests-with-coverage:
-    name: ${{ matrix.scheme }} Unit Tests
+    name: ${{ matrix.scheme.name }} Unit Tests
     strategy:
       fail-fast: false
       matrix:
         scheme: [
-          Amplify,
-          AWSPluginsCore,
-          AWSAPIPlugin,
-          AWSCloudWatchLoggingPlugin,
-          AWSCognitoAuthPlugin,
-          AWSDataStorePlugin,
-          AWSLocationGeoPlugin,
-          AWSPredictionsPlugin,
-          AWSPinpointAnalyticsPlugin,
-          AWSPinpointPushNotificationsPlugin,
-          AWSS3StoragePlugin,
-          CoreMLPredictionsPlugin
+          { name: Amplify, flags: 'Amplify,unit_tests' },
+          { name: AWSPluginsCore, flags: 'AWSPluginsCore,unit_tests' },
+          { name: AWSAPIPlugin, flags: 'API_plugin_unit_test,unit_tests' },
+          { name: AWSCloudWatchLoggingPlugin, flags: 'Logging_plugin_unit_test,unit_tests' },
+          { name: AWSCognitoAuthPlugin, flags: 'Auth_plugin_unit_test,unit_tests' },
+          { name: AWSDataStorePlugin, flags: 'DataStore_plugin_unit_test,unit_tests' },
+          { name: AWSLocationGeoPlugin, flags: 'Geo_plugin_unit_test,unit_tests' },
+          { name: AWSPredictionsPlugin, flags: 'Predictions_plugin_unit_test,unit_tests' },
+          { name: AWSPinpointAnalyticsPlugin, flags: 'Analytics_plugin_unit_test,unit_tests' },
+          { name: AWSPinpointPushNotificationsPlugin, flags: 'PushNotifications_plugin_unit_test,unit_tests' },
+          { name: AWSS3StoragePlugin, flags: 'Storage_plugin_unit_test,unit_tests' },
+          { name: CoreMLPredictionsPlugin, flags: 'CoreMLPredictions_plugin_unit_test,unit_tests' }
         ]
     uses: ./.github/workflows/run_xcodebuild_test_platforms.yml
     with:
-      scheme: ${{ matrix.scheme }}
+      scheme: ${{ matrix.scheme.name }}
       submit_coverage_report: true
+      coverage_flags: ${{ matrix.scheme.flags }}