@@ -47,6 +47,7 @@ say " _____ _
4747 "
4848CC_VERSION=" ${CC_VERSION:- latest} "
4949CC_FAIL_ON_ERROR=" ${CC_FAIL_ON_ERROR:- false} "
50+ CC_RUN_COMMAND=" ${CC_RUN_COMMAND:- upload-coverage} "
5051if [ -n " $CC_BINARY " ];
5152then
5253 if [ -f " $CC_BINARY " ];
@@ -136,91 +137,112 @@ then
136137fi
137138cc_cli_args+=( $( write_truthy_args CC_DISABLE_TELEM) )
138139cc_cli_args+=( $( write_truthy_args CC_VERBOSE) )
139- cc_uc_args=()
140+ if [ -n " $CC_TOKEN_VAR " ];
141+ then
142+ token=" $( eval echo \$ $CC_TOKEN_VAR ) "
143+ else
144+ token=" $( eval echo $CC_TOKEN ) "
145+ fi
146+ say " $g ->$x Token of length ${# token} detected"
147+ token_str=" "
148+ token_arg=()
149+ if [ -n " $token " ];
150+ then
151+ token_str+=" -t <redacted>"
152+ token_arg+=( " -t " " $token " )
153+ fi
154+ if [ " $CC_RUN_COMMAND " == " upload-coverage" ]; then
155+ cc_run_args=()
140156# Args for create commit
141- cc_uc_args +=( $( write_truthy_args CC_FAIL_ON_ERROR) )
142- cc_uc_args +=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
143- cc_uc_args +=( $( k_arg PARENT_SHA) $( v_arg PARENT_SHA) )
144- cc_uc_args +=( $( k_arg PR) $( v_arg PR) )
145- cc_uc_args +=( $( k_arg SHA) $( v_arg SHA) )
146- cc_uc_args +=( $( k_arg SLUG) $( v_arg SLUG) )
157+ cc_run_args +=( $( write_truthy_args CC_FAIL_ON_ERROR) )
158+ cc_run_args +=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
159+ cc_run_args +=( $( k_arg PARENT_SHA) $( v_arg PARENT_SHA) )
160+ cc_run_args +=( $( k_arg PR) $( v_arg PR) )
161+ cc_run_args +=( $( k_arg SHA) $( v_arg SHA) )
162+ cc_run_args +=( $( k_arg SLUG) $( v_arg SLUG) )
147163# Args for create report
148- cc_uc_args +=( $( k_arg CODE) $( v_arg CODE) )
164+ cc_run_args +=( $( k_arg CODE) $( v_arg CODE) )
149165# Args for do upload
150- cc_uc_args +=( $( k_arg ENV) $( v_arg ENV) )
166+ cc_run_args +=( $( k_arg ENV) $( v_arg ENV) )
151167OLDIFS=$IFS ; IFS=,
152- cc_uc_args +=( $( k_arg BRANCH) $( v_arg BRANCH) )
153- cc_uc_args +=( $( k_arg BUILD) $( v_arg BUILD) )
154- cc_uc_args +=( $( k_arg BUILD_URL) $( v_arg BUILD_URL) )
155- cc_uc_args +=( $( k_arg DIR) $( v_arg DIR) )
156- cc_uc_args +=( $( write_truthy_args CC_DISABLE_FILE_FIXES) )
157- cc_uc_args +=( $( write_truthy_args CC_DISABLE_SEARCH) )
158- cc_uc_args +=( $( write_truthy_args CC_DRY_RUN) )
168+ cc_run_args +=( $( k_arg BRANCH) $( v_arg BRANCH) )
169+ cc_run_args +=( $( k_arg BUILD) $( v_arg BUILD) )
170+ cc_run_args +=( $( k_arg BUILD_URL) $( v_arg BUILD_URL) )
171+ cc_run_args +=( $( k_arg DIR) $( v_arg DIR) )
172+ cc_run_args +=( $( write_truthy_args CC_DISABLE_FILE_FIXES) )
173+ cc_run_args +=( $( write_truthy_args CC_DISABLE_SEARCH) )
174+ cc_run_args +=( $( write_truthy_args CC_DRY_RUN) )
159175if [ -n " $CC_EXCLUDES " ];
160176then
161177 for directory in $CC_EXCLUDES ; do
162- cc_uc_args +=( " --exclude" " $directory " )
178+ cc_run_args +=( " --exclude" " $directory " )
163179 done
164180fi
165181if [ -n " $CC_FILES " ];
166182then
167183 for file in $CC_FILES ; do
168- cc_uc_args +=( " --file" " $file " )
184+ cc_run_args +=( " --file" " $file " )
169185 done
170186fi
171187if [ -n " $CC_FLAGS " ];
172188then
173189 for flag in $CC_FLAGS ; do
174- cc_uc_args +=( " --flag" " $flag " )
190+ cc_run_args +=( " --flag" " $flag " )
175191 done
176192fi
177- cc_uc_args +=( $( k_arg GCOV_ARGS) $( v_arg GCOV_ARGS) )
178- cc_uc_args +=( $( k_arg GCOV_EXECUTABLE) $( v_arg GCOV_EXECUTABLE) )
179- cc_uc_args +=( $( k_arg GCOV_IGNORE) $( v_arg GCOV_IGNORE) )
180- cc_uc_args +=( $( k_arg GCOV_INCLUDE) $( v_arg GCOV_INCLUDE) )
181- cc_uc_args +=( $( write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
182- cc_uc_args +=( $( k_arg JOB_CODE) $( v_arg JOB_CODE) )
183- cc_uc_args +=( $( write_truthy_args CC_LEGACY) )
193+ cc_run_args +=( $( k_arg GCOV_ARGS) $( v_arg GCOV_ARGS) )
194+ cc_run_args +=( $( k_arg GCOV_EXECUTABLE) $( v_arg GCOV_EXECUTABLE) )
195+ cc_run_args +=( $( k_arg GCOV_IGNORE) $( v_arg GCOV_IGNORE) )
196+ cc_run_args +=( $( k_arg GCOV_INCLUDE) $( v_arg GCOV_INCLUDE) )
197+ cc_run_args +=( $( write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
198+ cc_run_args +=( $( k_arg JOB_CODE) $( v_arg JOB_CODE) )
199+ cc_run_args +=( $( write_truthy_args CC_LEGACY) )
184200if [ -n " $CC_NAME " ];
185201then
186- cc_uc_args +=( " --name" " $CC_NAME " )
202+ cc_run_args +=( " --name" " $CC_NAME " )
187203fi
188- cc_uc_args +=( $( k_arg NETWORK_FILTER) $( v_arg NETWORK_FILTER) )
189- cc_uc_args +=( $( k_arg NETWORK_PREFIX) $( v_arg NETWORK_PREFIX) )
190- cc_uc_args +=( $( k_arg NETWORK_ROOT_FOLDER) $( v_arg NETWORK_ROOT_FOLDER) )
204+ cc_run_args +=( $( k_arg NETWORK_FILTER) $( v_arg NETWORK_FILTER) )
205+ cc_run_args +=( $( k_arg NETWORK_PREFIX) $( v_arg NETWORK_PREFIX) )
206+ cc_run_args +=( $( k_arg NETWORK_ROOT_FOLDER) $( v_arg NETWORK_ROOT_FOLDER) )
191207if [ -n " $CC_PLUGINS " ];
192208then
193209 for plugin in $CC_PLUGINS ; do
194- cc_uc_args +=( " --plugin" " $plugin " )
210+ cc_run_args +=( " --plugin" " $plugin " )
195211 done
196212fi
197- cc_uc_args +=( $( k_arg REPORT_TYPE) $( v_arg REPORT_TYPE) )
198- cc_uc_args +=( $( k_arg SWIFT_PROJECT) $( v_arg SWIFT_PROJECT) )
213+ cc_run_args +=( $( k_arg REPORT_TYPE) $( v_arg REPORT_TYPE) )
214+ cc_run_args +=( $( k_arg SWIFT_PROJECT) $( v_arg SWIFT_PROJECT) )
199215IFS=$OLDIFS
216+ elif [ " $CC_RUN_COMMAND " == " empty-upload" ]; then
217+ cc_run_args=()
218+ cc_run_args+=( $( write_truthy_args CC_FAIL_ON_ERROR) )
219+ cc_run_args+=( $( write_truthy_args CC_FORCE) )
220+ cc_run_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
221+ cc_run_args+=( $( k_arg SHA) $( v_arg SHA) )
222+ cc_run_args+=( $( k_arg SLUG) $( v_arg SLUG) )
223+ elif [ " $CC_RUN_COMMAND " == " pr-base-picking" ]; then
224+ cc_run_args=()
225+ cc_run_args+=( $( k_arg BASE_SHA) $( v_arg BASE_SHA) )
226+ cc_run_args+=( $( k_arg PR) $( v_arg PR) )
227+ cc_run_args+=( $( k_arg SLUG) $( v_arg SLUG) )
228+ cc_run_args+=( $( k_arg SERVICE) $( v_arg SERVICE) )
229+ elif [ " $CC_RUN_COMMAND " == " send-notifications" ]; then
230+ cc_run_args=()
231+ cc_run_args+=( $( k_arg SHA) $( v_arg SHA) )
232+ cc_run_args+=( $( write_truthy_args CC_FAIL_ON_ERROR) )
233+ cc_run_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
234+ cc_run_args+=( $( k_arg SLUG) $( v_arg SLUG) )
235+ fi
200236unset NODE_OPTIONS
201237# See https://github.com/codecov/uploader/issues/475
202- chmod +x $cc_command
203- if [ -n " $CC_TOKEN_VAR " ];
204- then
205- token=" $( eval echo \$ $CC_TOKEN_VAR ) "
206- else
207- token=" $( eval echo $CC_TOKEN ) "
208- fi
209- say " $g ->$x Token of length ${# token} detected"
210- token_str=" "
211- token_arg=()
212- if [ -n " $token " ];
213- then
214- token_str+=" -t <redacted>"
215- token_arg+=( " -t " " $token " )
216- fi
217- say " $g ==>$x Running upload-coverage"
218- say " $b$cc_command $( echo " ${cc_cli_args[@]} " ) upload-coverage$token_str $( echo " ${cc_uc_args[@]} " ) $x "
238+ chmod +x " $cc_command "
239+ say " $g ==>$x Running $CC_RUN_COMMAND "
240+ say " $b$cc_command $( echo " ${cc_cli_args[@]} " ) $CC_RUN_COMMAND$token_str $( echo " ${cc_run_args[@]} " ) $x "
219241if ! $cc_command \
220242 ${cc_cli_args[*]} \
221- upload-coverage \
243+ ${CC_RUN_COMMAND} \
222244 ${token_arg[*]} \
223- " ${cc_uc_args [@]} " ;
245+ " ${cc_run_args [@]} " ;
224246then
225- exit_if_error " Failed to upload coverage "
247+ exit_if_error " Failed to run $CC_RUN_COMMAND "
226248fi
0 commit comments