Skip to content

Commit c63f5c9

Browse files
thomasrockhu-codecovthomasrockhu-codecov
authored
Merge pull request #24 from codecov/tony/use-upload-coverage
Use upload-coverage in place of create-commit, create-report and do-upload
2 parents 588410f + 70c2e45 commit c63f5c9

File tree

7 files changed

+122
-195
lines changed

7 files changed

+122
-195
lines changed

‎dist/codecov.sh

Lines changed: 41 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -129,76 +129,66 @@ then
129129
cc_cli_args+=( "$CC_YML_PATH" )
130130
fi
131131
cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
132-
cc_cc_args=()
133-
cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
134-
cc_cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
135-
cc_cc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
136-
cc_cc_args+=( $(k_arg PR) $(v_arg PR))
137-
cc_cc_args+=( $(k_arg SHA) $(v_arg SHA))
138-
cc_cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
139-
cc_create_report_args=()
140-
cc_cr_args+=( $(k_arg CODE) $(v_arg CODE))
141-
cc_cr_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
142-
cc_cr_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
143-
cc_cr_args+=( $(k_arg PR) $(v_arg PR))
144-
cc_cr_args+=( $(k_arg SHA) $(v_arg SHA))
145-
cc_cr_args+=( $(k_arg SLUG) $(v_arg SLUG))
146-
cc_du_args=()
147-
cc_du_args+=( $(k_arg ENV) $(v_arg ENV))
132+
cc_uc_args=()
133+
# Args for create commit
134+
cc_uc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
135+
cc_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
136+
cc_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
137+
cc_uc_args+=( $(k_arg PR) $(v_arg PR))
138+
cc_uc_args+=( $(k_arg SHA) $(v_arg SHA))
139+
cc_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
140+
# Args for create report
141+
cc_uc_args+=( $(k_arg CODE) $(v_arg CODE))
142+
# Args for do upload
143+
cc_uc_args+=( $(k_arg ENV) $(v_arg ENV))
148144
OLDIFS=$IFS;IFS=,
149-
cc_du_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
150-
cc_du_args+=( $(k_arg BUILD) $(v_arg BUILD))
151-
cc_du_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
152-
cc_du_args+=( $(k_arg CODE) $(v_arg CODE))
153-
cc_du_args+=( $(k_arg DIR) $(v_arg DIR))
154-
cc_du_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
155-
cc_du_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
156-
cc_du_args+=( $(write_truthy_args CC_DRY_RUN) )
145+
cc_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
146+
cc_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
147+
cc_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
148+
cc_uc_args+=( $(k_arg DIR) $(v_arg DIR))
149+
cc_uc_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
150+
cc_uc_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
151+
cc_uc_args+=( $(write_truthy_args CC_DRY_RUN) )
157152
if [ -n "$CC_EXCLUDES" ];
158153
then
159154
for directory in $CC_EXCLUDES; do
160-
cc_du_args+=( "--exclude" "$directory" )
155+
cc_uc_args+=( "--exclude" "$directory" )
161156
done
162157
fi
163-
cc_du_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
164158
if [ -n "$CC_FILES" ];
165159
then
166160
for file in $CC_FILES; do
167-
cc_du_args+=( "--file" "$file" )
161+
cc_uc_args+=( "--file" "$file" )
168162
done
169163
fi
170164
if [ -n "$CC_FLAGS" ];
171165
then
172166
for flag in $CC_FLAGS; do
173-
cc_du_args+=( "--flag" "$flag" )
167+
cc_uc_args+=( "--flag" "$flag" )
174168
done
175169
fi
176-
cc_du_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
177-
cc_du_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
178-
cc_du_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
179-
cc_du_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
180-
cc_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
181-
cc_du_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
182-
cc_du_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
183-
cc_du_args+=( $(write_truthy_args CC_LEGACY) )
170+
cc_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
171+
cc_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
172+
cc_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
173+
cc_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
174+
cc_uc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
175+
cc_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
176+
cc_uc_args+=( $(write_truthy_args CC_LEGACY) )
184177
if [ -n "$CC_NAME" ];
185178
then
186-
cc_du_args+=( "--name" "$CC_NAME" )
179+
cc_uc_args+=( "--name" "$CC_NAME" )
187180
fi
188-
cc_du_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
189-
cc_du_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
190-
cc_du_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
181+
cc_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
182+
cc_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
183+
cc_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
191184
if [ -n "$CC_PLUGINS" ];
192185
then
193186
for plugin in $CC_PLUGINS; do
194-
cc_du_args+=( "--plugin" "$plugin" )
187+
cc_uc_args+=( "--plugin" "$plugin" )
195188
done
196189
fi
197-
cc_du_args+=( $(k_arg PR) $(v_arg PR))
198-
cc_du_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
199-
cc_du_args+=( $(k_arg SHA) $(v_arg SHA))
200-
cc_du_args+=( $(k_arg SLUG) $(v_arg SLUG))
201-
cc_du_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
190+
cc_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
191+
cc_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
202192
IFS=$OLDIFS
203193
unset NODE_OPTIONS
204194
# See https://github.com/codecov/uploader/issues/475
@@ -217,35 +207,13 @@ then
217207
token_str+=" -t <redacted>"
218208
token_arg+=( " -t " "$token")
219209
fi
220-
say "$g==>$x Running create-commit"
221-
say " $b./$cc_filename $(echo "${cc_cli_args[@]}") create-commit$token_str $(echo "${cc_cc_args[@]}")$x"
210+
say "$g==>$x Running upload-coverage"
211+
say " $b./$cc_filename $(echo "${cc_cli_args[@]}") upload-coverage$token_str $(echo "${cc_uc_args[@]}")$x"
222212
if ! ./$cc_filename \
223213
${cc_cli_args[*]} \
224-
create-commit \
214+
upload-coverage \
225215
${token_arg[*]} \
226-
"${cc_cc_args[@]}";
216+
"${cc_uc_args[@]}";
227217
then
228-
exit_if_error "Failed to create-commit"
229-
fi
230-
say " "
231-
say "$g==>$x Running create-report"
232-
say " $b./$cc_filename $(echo "${cc_cli_args[@]}") create-report$token_str $(echo "${cc_cr_args[@]}")$x"
233-
if ! ./$cc_filename \
234-
${cc_cli_args[*]} \
235-
create-report \
236-
${token_arg[*]} \
237-
"${cc_cr_args[@]}";
238-
then
239-
exit_if_error "Failed to create-report"
240-
fi
241-
say " "
242-
say "$g==>$x Running do-upload"
243-
say " $b./$cc_filename $(echo "${cc_cli_args[@]}") do-upload$token_str $(echo "${cc_du_args[@]}")$x"
244-
if ! ./$cc_filename \
245-
${cc_cli_args[*]} \
246-
do-upload \
247-
${token_arg[*]} \
248-
"${cc_du_args[@]}";
249-
then
250-
exit_if_error "Failed to upload"
218+
exit_if_error "Failed to upload coverage"
251219
fi

‎scripts/run.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
. ./validate.sh
77

88
. ./set_cli_args.sh
9-
. ./set_create_commit_args.sh
10-
. ./set_create_report_args.sh
11-
. ./set_do_upload_args.sh
9+
. ./set_upload_coverage_args.sh
1210
. ./upload.sh

‎scripts/set_create_commit_args.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎scripts/set_create_report_args.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎scripts/set_do_upload_args.sh

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎scripts/set_upload_coverage_args.sh

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#!/usr/bin/env bash
2+
3+
codecov_uc_args=()
4+
5+
# Args for create commit
6+
codecov_uc_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
7+
codecov_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8+
codecov_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
9+
codecov_uc_args+=( $(k_arg PR) $(v_arg PR))
10+
codecov_uc_args+=( $(k_arg SHA) $(v_arg SHA))
11+
codecov_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
12+
13+
# Args for create report
14+
codecov_uc_args+=( $(k_arg CODE) $(v_arg CODE))
15+
16+
# Args for do upload
17+
codecov_uc_args+=( $(k_arg ENV) $(v_arg ENV))
18+
19+
OLDIFS=$IFS;IFS=,
20+
21+
codecov_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
22+
codecov_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
23+
codecov_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
24+
codecov_uc_args+=( $(k_arg DIR) $(v_arg DIR))
25+
codecov_uc_args+=( $(write_truthy_args CODECOV_DISABLE_FILE_FIXES) )
26+
codecov_uc_args+=( $(write_truthy_args CODECOV_DISABLE_SEARCH) )
27+
codecov_uc_args+=( $(write_truthy_args CODECOV_DRY_RUN) )
28+
29+
if [ -n "$CODECOV_EXCLUDES" ];
30+
then
31+
for directory in $CODECOV_EXCLUDES; do
32+
codecov_uc_args+=( "--exclude" "$directory" )
33+
done
34+
fi
35+
36+
if [ -n "$CODECOV_FILES" ];
37+
then
38+
for file in $CODECOV_FILES; do
39+
codecov_uc_args+=( "--file" "$file" )
40+
done
41+
fi
42+
43+
if [ -n "$CODECOV_FLAGS" ];
44+
then
45+
for flag in $CODECOV_FLAGS; do
46+
codecov_uc_args+=( "--flag" "$flag" )
47+
done
48+
fi
49+
50+
codecov_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
51+
codecov_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
52+
codecov_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
53+
codecov_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
54+
codecov_uc_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
55+
codecov_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
56+
codecov_uc_args+=( $(write_truthy_args CODECOV_LEGACY) )
57+
if [ -n "$CODECOV_NAME" ];
58+
then
59+
codecov_uc_args+=( "--name" "$CODECOV_NAME" )
60+
fi
61+
codecov_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
62+
codecov_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
63+
codecov_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
64+
65+
if [ -n "$CODECOV_PLUGINS" ];
66+
then
67+
for plugin in $CODECOV_PLUGINS; do
68+
codecov_uc_args+=( "--plugin" "$plugin" )
69+
done
70+
fi
71+
72+
codecov_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
73+
codecov_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
74+
75+
IFS=$OLDIFS

‎scripts/upload.sh

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,13 @@ then
2121
token_arg+=( " -t " "$token")
2222
fi
2323

24-
say "$g==>$x Running create-commit"
25-
say " $b./$codecov_filename $(echo "${codecov_cli_args[@]}") create-commit$token_str $(echo "${codecov_cc_args[@]}")$x"
24+
say "$g==>$x Running upload-coverage"
25+
say " $b./$codecov_filename $(echo "${codecov_cli_args[@]}") upload-coverage$token_str $(echo "${codecov_uc_args[@]}")$x"
2626
if ! ./$codecov_filename \
2727
${codecov_cli_args[*]} \
28-
create-commit \
28+
upload-coverage \
2929
${token_arg[*]} \
30-
"${codecov_cc_args[@]}";
30+
"${codecov_uc_args[@]}";
3131
then
32-
exit_if_error "Failed to create-commit"
33-
fi
34-
say " "
35-
36-
say "$g==>$x Running create-report"
37-
say " $b./$codecov_filename $(echo "${codecov_cli_args[@]}") create-report$token_str $(echo "${codecov_cr_args[@]}")$x"
38-
if ! ./$codecov_filename \
39-
${codecov_cli_args[*]} \
40-
create-report \
41-
${token_arg[*]} \
42-
"${codecov_cr_args[@]}";
43-
then
44-
exit_if_error "Failed to create-report"
45-
fi
46-
say " "
47-
48-
say "$g==>$x Running do-upload"
49-
say " $b./$codecov_filename $(echo "${codecov_cli_args[@]}") do-upload$token_str $(echo "${codecov_du_args[@]}")$x"
50-
if ! ./$codecov_filename \
51-
${codecov_cli_args[*]} \
52-
do-upload \
53-
${token_arg[*]} \
54-
"${codecov_du_args[@]}";
55-
then
56-
exit_if_error "Failed to upload"
32+
exit_if_error "Failed to upload coverage"
5733
fi

0 commit comments

Comments
 (0)