1
1
#! /usr/bin/env bash
2
- CC_WRAPPER_VERSION=" 0.1 .0"
2
+ CC_WRAPPER_VERSION=" 0.2 .0"
3
3
set +u
4
4
say () {
5
5
echo -e " $1 "
@@ -27,7 +27,7 @@ v_arg() {
27
27
echo " $( eval echo \$ " CC_$1 " ) "
28
28
fi
29
29
}
30
- write_truthy_args () {
30
+ write_bool_args () {
31
31
if [ " $( eval echo \$ $1 ) " = " true" ] || [ " $( eval echo \$ $1 ) " = " 1" ];
32
32
then
33
33
echo " -$( lower $1 ) "
143
143
cc_cli_args+=( " --codecov-yml-path" )
144
144
cc_cli_args+=( " $CC_YML_PATH " )
145
145
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) )
148
148
if [ -n " $CC_TOKEN_VAR " ];
149
149
then
150
150
token=" $( eval echo \$ $CC_TOKEN_VAR ) "
162
162
if [ " $CC_RUN_CMD " == " upload-coverage" ]; then
163
163
cc_args=()
164
164
# Args for create commit
165
- cc_args+=( $( write_truthy_args CC_FAIL_ON_ERROR) )
165
+ cc_args+=( $( write_bool_args CC_FAIL_ON_ERROR) )
166
166
cc_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
167
167
cc_args+=( $( k_arg PARENT_SHA) $( v_arg PARENT_SHA) )
168
168
cc_args+=( $( k_arg PR) $( v_arg PR) )
@@ -177,9 +177,9 @@ cc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
177
177
cc_args+=( $( k_arg BUILD) $( v_arg BUILD) )
178
178
cc_args+=( $( k_arg BUILD_URL) $( v_arg BUILD_URL) )
179
179
cc_args+=( $( k_arg DIR) $( v_arg DIR) )
180
- cc_args+=( $( write_truthy_args CC_DISABLE_FILE_FIXES) )
181
- cc_args+=( $( write_truthy_args CC_DISABLE_SEARCH) )
182
- cc_args+=( $( write_truthy_args CC_DRY_RUN) )
180
+ cc_args+=( $( write_bool_args CC_DISABLE_FILE_FIXES) )
181
+ cc_args+=( $( write_bool_args CC_DISABLE_SEARCH) )
182
+ cc_args+=( $( write_bool_args CC_DRY_RUN) )
183
183
if [ -n " $CC_EXCLUDES " ];
184
184
then
185
185
for directory in $CC_EXCLUDES ; do
@@ -202,9 +202,10 @@ cc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
202
202
cc_args+=( $( k_arg GCOV_EXECUTABLE) $( v_arg GCOV_EXECUTABLE) )
203
203
cc_args+=( $( k_arg GCOV_IGNORE) $( v_arg GCOV_IGNORE) )
204
204
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) )
206
207
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) )
208
209
if [ -n " $CC_NAME " ];
209
210
then
210
211
cc_args+=( " --name" " $CC_NAME " )
@@ -223,8 +224,8 @@ cc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
223
224
IFS=$OLDIFS
224
225
elif [ " $CC_RUN_CMD " == " empty-upload" ]; then
225
226
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) )
228
229
cc_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
229
230
cc_args+=( $( k_arg SHA) $( v_arg SHA) )
230
231
cc_args+=( $( k_arg SLUG) $( v_arg SLUG) )
@@ -237,17 +238,17 @@ cc_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
237
238
elif [ " $CC_RUN_CMD " == " send-notifications" ]; then
238
239
cc_args=()
239
240
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) )
241
242
cc_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
242
243
cc_args+=( $( k_arg SLUG) $( v_arg SLUG) )
243
244
else
244
245
exit_if_error " Invalid run command specified: $CC_RUN_CMD "
245
246
exit
246
247
fi
247
248
unset NODE_OPTIONS
248
- # See https://github.com/codecov/uploader/issues/475
249
+ # https://github.com/codecov/uploader/issues/475
249
250
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 "
251
252
if ! $cc_command \
252
253
${cc_cli_args[*]} \
253
254
${CC_RUN_CMD} \
0 commit comments