Skip to content

Commit 2595437

Browse files
tony-codecovtony-codecov
committed
Adding upload coverage args in scripts
1 parent 0916bb4 commit 2595437

File tree

6 files changed

+112
-139
lines changed

6 files changed

+112
-139
lines changed

‎dist/codecov.sh

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -125,76 +125,66 @@ cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
125125
cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
126126
cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
127127
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))
128+
cc_uc_args=()
129+
# Args for create commit
130+
cc_uc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
131+
cc_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
132+
cc_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
133+
cc_uc_args+=( $(k_arg PR) $(v_arg PR))
134+
cc_uc_args+=( $(k_arg SHA) $(v_arg SHA))
135+
cc_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
136+
# Args for create report
137+
cc_uc_args+=( $(k_arg CODE) $(v_arg CODE))
138+
# Args for do upload
139+
cc_uc_args+=( $(k_arg ENV) $(v_arg ENV))
144140
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) )
141+
cc_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
142+
cc_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
143+
cc_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
144+
cc_uc_args+=( $(k_arg DIR) $(v_arg DIR))
145+
cc_uc_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
146+
cc_uc_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
147+
cc_uc_args+=( $(write_truthy_args CC_DRY_RUN) )
153148
if [ -n "$CC_EXCLUDES" ];
154149
then
155150
for directory in $CC_EXCLUDES; do
156-
cc_du_args+=( "--exclude" "$directory" )
151+
cc_uc_args+=( "--exclude" "$directory" )
157152
done
158153
fi
159-
cc_du_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
160154
if [ -n "$CC_FILES" ];
161155
then
162156
for file in $CC_FILES; do
163-
cc_du_args+=( "--file" "$file" )
157+
cc_uc_args+=( "--file" "$file" )
164158
done
165159
fi
166160
if [ -n "$CC_FLAGS" ];
167161
then
168162
for flag in $CC_FLAGS; do
169-
cc_du_args+=( "--flag" "$flag" )
163+
cc_uc_args+=( "--flag" "$flag" )
170164
done
171165
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) )
166+
cc_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
167+
cc_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
168+
cc_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
169+
cc_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
170+
cc_uc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
171+
cc_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
172+
cc_uc_args+=( $(write_truthy_args CC_LEGACY) )
180173
if [ -n "$CC_NAME" ];
181174
then
182-
cc_du_args+=( "--name" "$CC_NAME" )
175+
cc_uc_args+=( "--name" "$CC_NAME" )
183176
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))
177+
cc_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
178+
cc_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
179+
cc_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
187180
if [ -n "$CC_PLUGINS" ];
188181
then
189182
for plugin in $CC_PLUGINS; do
190-
cc_du_args+=( "--plugin" "$plugin" )
183+
cc_uc_args+=( "--plugin" "$plugin" )
191184
done
192185
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))
186+
cc_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
187+
cc_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
198188
IFS=$OLDIFS
199189
unset NODE_OPTIONS
200190
# See https://github.com/codecov/uploader/issues/475

‎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

0 commit comments

Comments
 (0)