diff options
| author | jmkiley <jordan.kiley@mapbox.com> | 2019-04-29 15:56:08 -0700 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2019-04-29 15:56:08 -0700 |
| commit | e47c1f13c0e9759def762628764bcd13d7aaddf6 (patch) | |
| tree | cedf09b37778872fcfe117e004e2334352182269 | |
| parent | 8f5e1ba20f7a356c5bdabb7cb9d0d10bb4d73e10 (diff) | |
| download | qtlocation-mapboxgl-e47c1f13c0e9759def762628764bcd13d7aaddf6.tar.gz | |
Update script, move code cov generation
| -rw-r--r-- | circle.yml | 9 | ||||
| -rwxr-xr-x | scripts/code-coverage.sh | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/circle.yml b/circle.yml index 7a37777e01..1bee7cfad0 100644 --- a/circle.yml +++ b/circle.yml @@ -963,10 +963,6 @@ jobs: - run: name: Build and run SDK unit tests with thread and undefined behavior sanitizers command: make ios-sanitize - - run: - name: Get iOS code coverage - command: | - platform/ios/scripts/ios-code-coverage.sh CI - save-dependencies - collect-xcode-build-logs - upload-xcode-build-logs @@ -1026,6 +1022,11 @@ jobs: name: Build dynamic framework for device and simulator command: make iframework no_output_timeout: 5m + - build-ios-test + - run: + name: Get iOS code coverage + command: | + platform/ios/scripts/ios-code-coverage.sh CI - deploy: name: Upload snapshot build to s3 command: | diff --git a/scripts/code-coverage.sh b/scripts/code-coverage.sh index cb99bd9646..2202707952 100755 --- a/scripts/code-coverage.sh +++ b/scripts/code-coverage.sh @@ -21,12 +21,14 @@ circle_sha="" if [[ $CIRCLE_SHA1 ]]; then circle_sha="$CIRCLE_SHA1" fi -# Create a formatted JSON file that contains the current coverage. +commit_message= git log --format=oneline -n 1 $CIRCLE_SHA1 +echo $commit_message +# Create a formatted JSON file that contains the current coverage. current_date=$(TZ=UTC date +"%FT%T%z") file_name=$2_coverage.json cat <<EOF > $file_name -{"code_coverage":$1,"platform":"$2","sdk":"Maps","scheme":"$3","created_at":"$current_date","sha":"$circle_sha"} +{"code_coverage":$1,"branch":"$CIRCLE_BRANCH","commit_message":"$commit_message",platform":"$2","sdk":"Maps","scheme":"$3","created_at":"$current_date","sha":"$circle_sha"} EOF gzip -f $file_name @@ -34,5 +36,4 @@ if [ -z `which aws` ]; then brew install awscli fi -aws s3 cp $file_name.gz s3://mapbox-loading-dock/raw/mobile.codecoverage/$current_date/ -echo $ +aws s3 cp $file_name.gz s3://mapbox-loading-dock/raw/mobile.codecoverage/$current_date/
\ No newline at end of file |