1
1
#! /usr/bin/env bash
2
- CC_WRAPPER_VERSION=" 0.0.27 "
2
+ CC_WRAPPER_VERSION=" 0.0.29 "
3
3
set +u
4
4
say () {
5
5
echo -e " $1 "
6
6
}
7
7
exit_if_error () {
8
8
say " $r ==> $1 $x "
9
- if [ $CC_FAIL_ON_ERROR = true ];
9
+ if [ " $CC_FAIL_ON_ERROR " = true ];
10
10
then
11
11
say " $r Exiting...$x "
12
12
exit 1;
84
84
cc_url=" $cc_url /${CC_VERSION} "
85
85
cc_url=" $cc_url /${cc_os} /${cc_filename} "
86
86
say " $g ->$x Downloading $b ${cc_url} $x "
87
- curl -Os $cc_url
87
+ curl -Os " $cc_url "
88
88
say " $g ==>$x Finishing downloading $b ${cc_os} :${CC_VERSION} $x "
89
89
version_url=" https://cli.codecov.io/${cc_os} /${CC_VERSION} "
90
- version=$( curl -s $version_url -H " Accept:application/json" | jq -r ' .version' )
90
+ version=$( curl -s " $version_url " -H " Accept:application/json" | jq -r ' .version' )
91
91
say " Version: $b$version$x "
92
92
say " "
93
93
fi
123
123
cc_cli_args=()
124
124
cc_cli_args+=( $( k_arg AUTO_LOAD_PARAMS_FROM) $( v_arg AUTO_LOAD_PARAMS_FROM) )
125
125
cc_cli_args+=( $( k_arg ENTERPRISE_URL) $( v_arg ENTERPRISE_URL) )
126
- cc_cli_args+=( $( k_arg YML_PATH) $( v_arg YML_PATH) )
126
+ if [ -n " $CC_YML_PATH " ]
127
+ then
128
+ cc_cli_args+=( " --codecov-yml-path" )
129
+ cc_cli_args+=( " $CC_YML_PATH " )
130
+ fi
127
131
cc_cli_args+=( $( write_truthy_args CC_VERBOSE) )
128
- cc_cc_args=()
129
- cc_cc_args+=( $( write_truthy_args CC_FAIL_ON_ERROR) )
130
- cc_cc_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
131
- cc_cc_args+=( $( k_arg PARENT_SHA) $( v_arg PARENT_SHA) )
132
- cc_cc_args+=( $( k_arg PR) $( v_arg PR) )
133
- cc_cc_args+=( $( k_arg SHA) $( v_arg SHA) )
134
- cc_cc_args+=( $( k_arg SLUG) $( v_arg SLUG) )
135
- cc_create_report_args=()
136
- cc_cr_args+=( $( k_arg CODE) $( v_arg CODE) )
137
- cc_cr_args+=( $( write_truthy_args CC_FAIL_ON_ERROR) )
138
- cc_cr_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
139
- cc_cr_args+=( $( k_arg PR) $( v_arg PR) )
140
- cc_cr_args+=( $( k_arg SHA) $( v_arg SHA) )
141
- cc_cr_args+=( $( k_arg SLUG) $( v_arg SLUG) )
142
- cc_du_args=()
143
- 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) )
144
144
OLDIFS=$IFS ; IFS=,
145
- cc_du_args+=( $( k_arg BRANCH) $( v_arg BRANCH) )
146
- cc_du_args+=( $( k_arg BUILD) $( v_arg BUILD) )
147
- cc_du_args+=( $( k_arg BUILD_URL) $( v_arg BUILD_URL) )
148
- cc_du_args+=( $( k_arg CODE) $( v_arg CODE) )
149
- cc_du_args+=( $( k_arg DIR) $( v_arg DIR) )
150
- cc_du_args+=( $( write_truthy_args CC_DISABLE_FILE_FIXES) )
151
- cc_du_args+=( $( write_truthy_args CC_DISABLE_SEARCH) )
152
- 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) )
153
152
if [ -n " $CC_EXCLUDES " ];
154
153
then
155
154
for directory in $CC_EXCLUDES ; do
156
- cc_du_args +=( " --exclude" " $directory " )
155
+ cc_uc_args +=( " --exclude" " $directory " )
157
156
done
158
157
fi
159
- cc_du_args+=( $( write_truthy_args CC_FAIL_ON_ERROR) )
160
158
if [ -n " $CC_FILES " ];
161
159
then
162
160
for file in $CC_FILES ; do
163
- cc_du_args +=( " --file" " $file " )
161
+ cc_uc_args +=( " --file" " $file " )
164
162
done
165
163
fi
166
164
if [ -n " $CC_FLAGS " ];
167
165
then
168
166
for flag in $CC_FLAGS ; do
169
- cc_du_args +=( " --flag" " $flag " )
167
+ cc_uc_args +=( " --flag" " $flag " )
170
168
done
171
169
fi
172
- cc_du_args+=( $( k_arg GCOV_ARGS) $( v_arg GCOV_ARGS) )
173
- cc_du_args+=( $( k_arg GCOV_EXECUTABLE) $( v_arg GCOV_EXECUTABLE) )
174
- cc_du_args+=( $( k_arg GCOV_IGNORE) $( v_arg GCOV_IGNORE) )
175
- cc_du_args+=( $( k_arg GCOV_INCLUDE) $( v_arg GCOV_INCLUDE) )
176
- cc_du_args+=( $( k_arg GIT_SERVICE) $( v_arg GIT_SERVICE) )
177
- cc_du_args+=( $( write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
178
- cc_du_args+=( $( k_arg JOB_CODE) $( v_arg JOB_CODE) )
179
- 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) )
180
177
if [ -n " $CC_NAME " ];
181
178
then
182
- cc_du_args +=( " --name" " $CC_NAME " )
179
+ cc_uc_args +=( " --name" " $CC_NAME " )
183
180
fi
184
- cc_du_args +=( $( k_arg NETWORK_FILTER) $( v_arg NETWORK_FILTER) )
185
- cc_du_args +=( $( k_arg NETWORK_PREFIX) $( v_arg NETWORK_PREFIX) )
186
- 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) )
187
184
if [ -n " $CC_PLUGINS " ];
188
185
then
189
186
for plugin in $CC_PLUGINS ; do
190
- cc_du_args +=( " --plugin" " $plugin " )
187
+ cc_uc_args +=( " --plugin" " $plugin " )
191
188
done
192
189
fi
193
- cc_du_args+=( $( k_arg PR) $( v_arg PR) )
194
- cc_du_args+=( $( k_arg REPORT_TYPE) $( v_arg REPORT_TYPE) )
195
- cc_du_args+=( $( k_arg SHA) $( v_arg SHA) )
196
- cc_du_args+=( $( k_arg SLUG) $( v_arg SLUG) )
197
- 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) )
198
192
IFS=$OLDIFS
199
193
unset NODE_OPTIONS
200
194
# See https://github.com/codecov/uploader/issues/475
@@ -213,35 +207,13 @@ then
213
207
token_str+=" -t <redacted>"
214
208
token_arg+=( " -t " " $token " )
215
209
fi
216
- say " $g ==>$x Running create-commit"
217
- say " $b ./$cc_filename $( echo " ${cc_cli_args[@]} " ) create-commit$token_str $( echo " ${cc_cc_args[@]} " ) $x "
218
- if ! ./$cc_filename \
219
- ${cc_cli_args[*]} \
220
- create-commit \
221
- ${token_arg[*]} \
222
- " ${cc_cc_args[@]} " ;
223
- then
224
- exit_if_error " Failed to create-commit"
225
- fi
226
- say " "
227
- say " $g ==>$x Running create-report"
228
- say " $b ./$cc_filename $( echo " ${cc_cli_args[@]} " ) create-report$token_str $( echo " ${cc_cr_args[@]} " ) $x "
229
- if ! ./$cc_filename \
230
- ${cc_cli_args[*]} \
231
- create-report \
232
- ${token_arg[*]} \
233
- " ${cc_cr_args[@]} " ;
234
- then
235
- exit_if_error " Failed to create-report"
236
- fi
237
- say " "
238
- say " $g ==>$x Running do-upload"
239
- say " $b ./$cc_filename $( echo " ${cc_cli_args[@]} " ) do-upload$token_str $( echo " ${cc_du_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 "
240
212
if ! ./$cc_filename \
241
213
${cc_cli_args[*]} \
242
- do- upload \
214
+ upload-coverage \
243
215
${token_arg[*]} \
244
- " ${cc_du_args [@]} " ;
216
+ " ${cc_uc_args [@]} " ;
245
217
then
246
- exit_if_error " Failed to upload"
218
+ exit_if_error " Failed to upload coverage "
247
219
fi
0 commit comments