Skip to content

Commit 725c319

Browse files
Merge pull request #48 from codecov/th/0.2.0/add-recurse-submodules
chore(release): 0.2.0 add recurse-submodules flag to upload-coverage
2 parents ad7c646 + 8bde062 commit 725c319

File tree

9 files changed

+25
-22
lines changed

9 files changed

+25
-22
lines changed

dist/codecov.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
CC_WRAPPER_VERSION="0.1.0"
2+
CC_WRAPPER_VERSION="0.2.0"
33
set +u
44
say() {
55
echo -e "$1"
@@ -27,7 +27,7 @@ v_arg() {
2727
echo "$(eval echo \$"CC_$1")"
2828
fi
2929
}
30-
write_truthy_args() {
30+
write_bool_args() {
3131
if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ];
3232
then
3333
echo "-$(lower $1)"
@@ -143,8 +143,8 @@ then
143143
cc_cli_args+=( "--codecov-yml-path" )
144144
cc_cli_args+=( "$CC_YML_PATH" )
145145
fi
146-
cc_cli_args+=( $(write_truthy_args CC_DISABLE_TELEM) )
147-
cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
146+
cc_cli_args+=( $(write_bool_args CC_DISABLE_TELEM) )
147+
cc_cli_args+=( $(write_bool_args CC_VERBOSE) )
148148
if [ -n "$CC_TOKEN_VAR" ];
149149
then
150150
token="$(eval echo \$$CC_TOKEN_VAR)"
@@ -202,9 +202,10 @@ cc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
202202
cc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
203203
cc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
204204
cc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
205-
cc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
205+
cc_args+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) )
206+
cc_args+=( $(write_bool_args CC_RECURSE_SUBMODULES) )
206207
cc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
207-
cc_args+=( $(write_truthy_args CC_LEGACY) )
208+
cc_args+=( $(write_bool_args CC_LEGACY) )
208209
if [ -n "$CC_NAME" ];
209210
then
210211
cc_args+=( "--name" "$CC_NAME" )
@@ -223,8 +224,8 @@ cc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
223224
IFS=$OLDIFS
224225
elif [ "$CC_RUN_CMD" == "empty-upload" ]; then
225226
cc_args=()
226-
cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
227-
cc_args+=( $(write_truthy_args CC_FORCE) )
227+
cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
228+
cc_args+=( $(write_bool_args CC_FORCE) )
228229
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
229230
cc_args+=( $(k_arg SHA) $(v_arg SHA))
230231
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
@@ -237,17 +238,17 @@ cc_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
237238
elif [ "$CC_RUN_CMD" == "send-notifications" ]; then
238239
cc_args=()
239240
cc_args+=( $(k_arg SHA) $(v_arg SHA))
240-
cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
241+
cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
241242
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
242243
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
243244
else
244245
exit_if_error "Invalid run command specified: $CC_RUN_CMD"
245246
exit
246247
fi
247248
unset NODE_OPTIONS
248-
# See https://github.com/codecov/uploader/issues/475
249+
# https://github.com/codecov/uploader/issues/475
249250
say "$g==>$x Running $CC_RUN_CMD"
250-
say " $b$cc_command $(echo "${cc_cli_args[@]}")$CC_RUN_CMD$token_str $(echo "${cc_args[@]}")$x"
251+
say " $b$cc_command $(echo "${cc_cli_args[@]}") $CC_RUN_CMD$token_str $(echo "${cc_args[@]}")$x"
251252
if ! $cc_command \
252253
${cc_cli_args[*]} \
253254
${CC_RUN_CMD} \

env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ CC_PARENT_SHA
3737
CC_PLUGINS
3838
CC_PR
3939
CC_PUBLIC_PGP_KEY
40+
CC_RECURSE_SUBMODULES
4041
CC_REPORT_TYPE
4142
CC_RUN_CMD
4243
CC_SERVICE

scripts/run_command.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ else
1414
fi
1515

1616
unset NODE_OPTIONS
17-
# See https://github.com/codecov/uploader/issues/475
17+
# https://github.com/codecov/uploader/issues/475
1818

1919
say "$g==>$x Running $CODECOV_RUN_CMD"
20-
say " $b$codecov_command $(echo "${codecov_cli_args[@]}")$CODECOV_RUN_CMD$token_str $(echo "${codecov_args[@]}")$x"
20+
say " $b$codecov_command $(echo "${codecov_cli_args[@]}") $CODECOV_RUN_CMD$token_str $(echo "${codecov_args[@]}")$x"
2121
if ! $codecov_command \
2222
${codecov_cli_args[*]} \
2323
${CODECOV_RUN_CMD} \

scripts/set_cli_args.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ then
99
codecov_cli_args+=( "--codecov-yml-path" )
1010
codecov_cli_args+=( "$CODECOV_YML_PATH" )
1111
fi
12-
codecov_cli_args+=( $(write_truthy_args CODECOV_DISABLE_TELEM) )
13-
codecov_cli_args+=( $(write_truthy_args CODECOV_VERBOSE) )
12+
codecov_cli_args+=( $(write_bool_args CODECOV_DISABLE_TELEM) )
13+
codecov_cli_args+=( $(write_bool_args CODECOV_VERBOSE) )

scripts/set_defaults.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ v_arg() {
3232
fi
3333
}
3434

35-
write_truthy_args() {
35+
write_bool_args() {
3636
if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ];
3737
then
3838
echo "-$(lower $1)"

scripts/set_empty_upload_args.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
codecov_args=()
44

5-
codecov_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
6-
codecov_args+=( $(write_truthy_args CODECOV_FORCE) )
5+
codecov_args+=( $(write_bool_args CODECOV_FAIL_ON_ERROR) )
6+
codecov_args+=( $(write_bool_args CODECOV_FORCE) )
77
codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
88
codecov_args+=( $(k_arg SHA) $(v_arg SHA))
99
codecov_args+=( $(k_arg SLUG) $(v_arg SLUG))

scripts/set_send_notifications_args.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
codecov_args=()
44

55
codecov_args+=( $(k_arg SHA) $(v_arg SHA))
6-
codecov_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
6+
codecov_args+=( $(write_bool_args CODECOV_FAIL_ON_ERROR) )
77
codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
88
codecov_args+=( $(k_arg SLUG) $(v_arg SLUG))

scripts/set_upload_coverage_args.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ codecov_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
5151
codecov_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
5252
codecov_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
5353
codecov_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
54-
codecov_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
54+
codecov_args+=( $(write_bool_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
55+
codecov_args+=( $(write_bool_args CODECOV_RECURSE_SUBMODULES) )
5556
codecov_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
56-
codecov_args+=( $(write_truthy_args CODECOV_LEGACY) )
57+
codecov_args+=( $(write_bool_args CODECOV_LEGACY) )
5758
if [ -n "$CODECOV_NAME" ];
5859
then
5960
codecov_args+=( "--name" "$CODECOV_NAME" )

scripts/version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
CODECOV_WRAPPER_VERSION="0.1.0"
2+
CODECOV_WRAPPER_VERSION="0.2.0"

0 commit comments

Comments
 (0)