Skip to content

Commit 147f3d5

Browse files
thomasrockhu-codecovthomasrockhu-codecov
authored
Merge pull request #44 from codecov/th/use-pypi
feat: use-python
2 parents 53dd3b5 + a1eba21 commit 147f3d5

9 files changed

Lines changed: 123 additions & 109 deletions

‎dist/codecov.sh‎

Lines changed: 61 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ then
5757
else
5858
exit_if_error "Could not find binary file $CC_BINARY"
5959
fi
60+
elif [ "$CC_USE_PYPI" == "true" ];
61+
then
62+
if ! pip install codecov-cli"$([ "$CC_VERSION" == "latest" ] && echo "" || echo "==$CC_VERSION" )"; then
63+
exit_if_error "Could not install via pypi."
64+
exit
65+
fi
66+
cc_command="codecovcli"
6067
else
6168
if [ -n "$CC_OS" ];
6269
then
@@ -89,9 +96,9 @@ else
8996
say " Version: $b$version$x"
9097
say " "
9198
fi
92-
if [ "$CC_SKIP_VALIDATION" = "true" ] || [ -n "$CC_BINARY" ];
99+
if [ "$CC_SKIP_VALIDATION" == "true" ] || [ -n "$CC_BINARY" ] || [ "$CC_USE_PYPI" == "true" ];
93100
then
94-
say "$r==>$x Bypassing validation as requested by user"
101+
say "$r==>$x Bypassing validation..."
95102
else
96103
CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
97104
echo "${CC_PUBLIC_PGP_KEY}" | \
@@ -117,6 +124,7 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
117124
fi
118125
say "$g==>$x CLI integrity verified"
119126
say
127+
chmod +x "$cc_command"
120128
fi
121129
if [ -n "$CC_BINARY_LOCATION" ];
122130
then
@@ -152,100 +160,99 @@ then
152160
token_arg+=( " -t " "$token")
153161
fi
154162
if [ "$CC_RUN_COMMAND" == "upload-coverage" ]; then
155-
cc_run_args=()
163+
cc_args=()
156164
# Args for create commit
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))
165+
cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
166+
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
167+
cc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
168+
cc_args+=( $(k_arg PR) $(v_arg PR))
169+
cc_args+=( $(k_arg SHA) $(v_arg SHA))
170+
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
163171
# Args for create report
164-
cc_run_args+=( $(k_arg CODE) $(v_arg CODE))
172+
cc_args+=( $(k_arg CODE) $(v_arg CODE))
165173
# Args for do upload
166-
cc_run_args+=( $(k_arg ENV) $(v_arg ENV))
174+
cc_args+=( $(k_arg ENV) $(v_arg ENV))
167175
OLDIFS=$IFS;IFS=,
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) )
176+
cc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
177+
cc_args+=( $(k_arg BUILD) $(v_arg BUILD))
178+
cc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
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) )
175183
if [ -n "$CC_EXCLUDES" ];
176184
then
177185
for directory in $CC_EXCLUDES; do
178-
cc_run_args+=( "--exclude" "$directory" )
186+
cc_args+=( "--exclude" "$directory" )
179187
done
180188
fi
181189
if [ -n "$CC_FILES" ];
182190
then
183191
for file in $CC_FILES; do
184-
cc_run_args+=( "--file" "$file" )
192+
cc_args+=( "--file" "$file" )
185193
done
186194
fi
187195
if [ -n "$CC_FLAGS" ];
188196
then
189197
for flag in $CC_FLAGS; do
190-
cc_run_args+=( "--flag" "$flag" )
198+
cc_args+=( "--flag" "$flag" )
191199
done
192200
fi
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) )
201+
cc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
202+
cc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
203+
cc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
204+
cc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
205+
cc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
206+
cc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
207+
cc_args+=( $(write_truthy_args CC_LEGACY) )
200208
if [ -n "$CC_NAME" ];
201209
then
202-
cc_run_args+=( "--name" "$CC_NAME" )
210+
cc_args+=( "--name" "$CC_NAME" )
203211
fi
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))
212+
cc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
213+
cc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
214+
cc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
207215
if [ -n "$CC_PLUGINS" ];
208216
then
209217
for plugin in $CC_PLUGINS; do
210-
cc_run_args+=( "--plugin" "$plugin" )
218+
cc_args+=( "--plugin" "$plugin" )
211219
done
212220
fi
213-
cc_run_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
214-
cc_run_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
221+
cc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
222+
cc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
215223
IFS=$OLDIFS
216224
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))
225+
cc_args=()
226+
cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
227+
cc_args+=( $(write_truthy_args CC_FORCE) )
228+
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
229+
cc_args+=( $(k_arg SHA) $(v_arg SHA))
230+
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
223231
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))
232+
cc_args=()
233+
cc_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
234+
cc_args+=( $(k_arg PR) $(v_arg PR))
235+
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
236+
cc_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
229237
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))
238+
cc_args=()
239+
cc_args+=( $(k_arg SHA) $(v_arg SHA))
240+
cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
241+
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
242+
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
235243
else
236244
exit_if_error "Invalid run command specified: $CC_RUN_COMMAND"
237245
exit
238246
fi
239247
unset NODE_OPTIONS
240248
# See https://github.com/codecov/uploader/issues/475
241-
chmod +x "$cc_command"
242249
say "$g==>$x Running $CC_RUN_COMMAND"
243-
say " $b$cc_command $(echo "${cc_cli_args[@]}")$CC_RUN_COMMAND$token_str $(echo "${cc_run_args[@]}")$x"
250+
say " $b$cc_command $(echo "${cc_cli_args[@]}")$CC_RUN_COMMAND$token_str $(echo "${cc_args[@]}")$x"
244251
if ! $cc_command \
245252
${cc_cli_args[*]} \
246253
${CC_RUN_COMMAND} \
247254
${token_arg[*]} \
248-
"${cc_run_args[@]}";
255+
"${cc_args[@]}";
249256
then
250257
exit_if_error "Failed to run $CC_RUN_COMMAND"
251258
fi

‎env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ CC_SLUG
4646
CC_SWIFT_PROJECT
4747
CC_TOKEN
4848
CC_TOKEN_VAR
49+
CC_USE_PYPI
4950
CC_VERBOSE
5051
CC_VERSION
5152
CC_WRAPPER_VERSION

‎scripts/download.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ then
99
else
1010
exit_if_error "Could not find binary file $CODECOV_BINARY"
1111
fi
12+
elif [ "$CODECOV_USE_PYPI" == "true" ];
13+
then
14+
if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then
15+
exit_if_error "Could not install via pypi."
16+
exit
17+
fi
18+
codecov_command="codecovcli"
1219
else
1320
if [ -n "$CODECOV_OS" ];
1421
then

‎scripts/run_command.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ fi
1616
unset NODE_OPTIONS
1717
# See https://github.com/codecov/uploader/issues/475
1818

19-
chmod +x "$codecov_command"
20-
2119
say "$g==>$x Running $CODECOV_RUN_COMMAND"
22-
say " $b$codecov_command $(echo "${codecov_cli_args[@]}")$CODECOV_RUN_COMMAND$token_str $(echo "${codecov_run_args[@]}")$x"
20+
say " $b$codecov_command $(echo "${codecov_cli_args[@]}")$CODECOV_RUN_COMMAND$token_str $(echo "${codecov_args[@]}")$x"
2321
if ! $codecov_command \
2422
${codecov_cli_args[*]} \
2523
${CODECOV_RUN_COMMAND} \
2624
${token_arg[*]} \
27-
"${codecov_run_args[@]}";
25+
"${codecov_args[@]}";
2826
then
2927
exit_if_error "Failed to run $CODECOV_RUN_COMMAND"
3028
fi

‎scripts/set_empty_upload_args.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22

3-
codecov_run_args=()
3+
codecov_args=()
44

5-
codecov_run_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
6-
codecov_run_args+=( $(write_truthy_args CODECOV_FORCE) )
7-
codecov_run_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8-
codecov_run_args+=( $(k_arg SHA) $(v_arg SHA))
9-
codecov_run_args+=( $(k_arg SLUG) $(v_arg SLUG))
5+
codecov_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
6+
codecov_args+=( $(write_truthy_args CODECOV_FORCE) )
7+
codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8+
codecov_args+=( $(k_arg SHA) $(v_arg SHA))
9+
codecov_args+=( $(k_arg SLUG) $(v_arg SLUG))

‎scripts/set_pr_base_picking_args.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
codecov_run_args=()
3+
codecov_args=()
44

5-
codecov_run_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
6-
codecov_run_args+=( $(k_arg PR) $(v_arg PR))
7-
codecov_run_args+=( $(k_arg SLUG) $(v_arg SLUG))
8-
codecov_run_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
5+
codecov_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
6+
codecov_args+=( $(k_arg PR) $(v_arg PR))
7+
codecov_args+=( $(k_arg SLUG) $(v_arg SLUG))
8+
codecov_args+=( $(k_arg SERVICE) $(v_arg SERVICE))

‎scripts/set_send_notifications_args.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
codecov_run_args=()
3+
codecov_args=()
44

5-
codecov_run_args+=( $(k_arg SHA) $(v_arg SHA))
6-
codecov_run_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
7-
codecov_run_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8-
codecov_run_args+=( $(k_arg SLUG) $(v_arg SLUG))
5+
codecov_args+=( $(k_arg SHA) $(v_arg SHA))
6+
codecov_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
7+
codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8+
codecov_args+=( $(k_arg SLUG) $(v_arg SLUG))

‎scripts/set_upload_coverage_args.sh‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
#!/usr/bin/env bash
22

3-
codecov_run_args=()
3+
codecov_args=()
44

55
# Args for create commit
6-
codecov_run_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
7-
codecov_run_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8-
codecov_run_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
9-
codecov_run_args+=( $(k_arg PR) $(v_arg PR))
10-
codecov_run_args+=( $(k_arg SHA) $(v_arg SHA))
11-
codecov_run_args+=( $(k_arg SLUG) $(v_arg SLUG))
6+
codecov_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
7+
codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
8+
codecov_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
9+
codecov_args+=( $(k_arg PR) $(v_arg PR))
10+
codecov_args+=( $(k_arg SHA) $(v_arg SHA))
11+
codecov_args+=( $(k_arg SLUG) $(v_arg SLUG))
1212

1313
# Args for create report
14-
codecov_run_args+=( $(k_arg CODE) $(v_arg CODE))
14+
codecov_args+=( $(k_arg CODE) $(v_arg CODE))
1515

1616
# Args for do upload
17-
codecov_run_args+=( $(k_arg ENV) $(v_arg ENV))
17+
codecov_args+=( $(k_arg ENV) $(v_arg ENV))
1818

1919
OLDIFS=$IFS;IFS=,
2020

21-
codecov_run_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
22-
codecov_run_args+=( $(k_arg BUILD) $(v_arg BUILD))
23-
codecov_run_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
24-
codecov_run_args+=( $(k_arg DIR) $(v_arg DIR))
25-
codecov_run_args+=( $(write_truthy_args CODECOV_DISABLE_FILE_FIXES) )
26-
codecov_run_args+=( $(write_truthy_args CODECOV_DISABLE_SEARCH) )
27-
codecov_run_args+=( $(write_truthy_args CODECOV_DRY_RUN) )
21+
codecov_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
22+
codecov_args+=( $(k_arg BUILD) $(v_arg BUILD))
23+
codecov_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
24+
codecov_args+=( $(k_arg DIR) $(v_arg DIR))
25+
codecov_args+=( $(write_truthy_args CODECOV_DISABLE_FILE_FIXES) )
26+
codecov_args+=( $(write_truthy_args CODECOV_DISABLE_SEARCH) )
27+
codecov_args+=( $(write_truthy_args CODECOV_DRY_RUN) )
2828

2929
if [ -n "$CODECOV_EXCLUDES" ];
3030
then
3131
for directory in $CODECOV_EXCLUDES; do
32-
codecov_run_args+=( "--exclude" "$directory" )
32+
codecov_args+=( "--exclude" "$directory" )
3333
done
3434
fi
3535

3636
if [ -n "$CODECOV_FILES" ];
3737
then
3838
for file in $CODECOV_FILES; do
39-
codecov_run_args+=( "--file" "$file" )
39+
codecov_args+=( "--file" "$file" )
4040
done
4141
fi
4242

4343
if [ -n "$CODECOV_FLAGS" ];
4444
then
4545
for flag in $CODECOV_FLAGS; do
46-
codecov_run_args+=( "--flag" "$flag" )
46+
codecov_args+=( "--flag" "$flag" )
4747
done
4848
fi
4949

50-
codecov_run_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
51-
codecov_run_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
52-
codecov_run_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
53-
codecov_run_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
54-
codecov_run_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
55-
codecov_run_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
56-
codecov_run_args+=( $(write_truthy_args CODECOV_LEGACY) )
50+
codecov_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
51+
codecov_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
52+
codecov_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
53+
codecov_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
54+
codecov_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
55+
codecov_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
56+
codecov_args+=( $(write_truthy_args CODECOV_LEGACY) )
5757
if [ -n "$CODECOV_NAME" ];
5858
then
59-
codecov_run_args+=( "--name" "$CODECOV_NAME" )
59+
codecov_args+=( "--name" "$CODECOV_NAME" )
6060
fi
61-
codecov_run_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
62-
codecov_run_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
63-
codecov_run_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
61+
codecov_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
62+
codecov_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
63+
codecov_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
6464

6565
if [ -n "$CODECOV_PLUGINS" ];
6666
then
6767
for plugin in $CODECOV_PLUGINS; do
68-
codecov_run_args+=( "--plugin" "$plugin" )
68+
codecov_args+=( "--plugin" "$plugin" )
6969
done
7070
fi
7171

72-
codecov_run_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
73-
codecov_run_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
72+
codecov_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
73+
codecov_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
7474

7575
IFS=$OLDIFS

‎scripts/validate.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
if [ "$CODECOV_SKIP_VALIDATION" = "true" ] || [ -n "$CODECOV_BINARY" ];
3+
if [ "$CODECOV_SKIP_VALIDATION" == "true" ] || [ -n "$CODECOV_BINARY" ] || [ "$CODECOV_USE_PYPI" == "true" ];
44
then
5-
say "$r==>$x Bypassing validation as requested by user"
5+
say "$r==>$x Bypassing validation..."
66
else
77
. ./set_validation_key.sh
88
echo "${CODECOV_PUBLIC_PGP_KEY}" | \
@@ -31,6 +31,7 @@ else
3131
fi
3232
say "$g==>$x CLI integrity verified"
3333
say
34+
chmod +x "$codecov_command"
3435
fi
3536

3637
if [ -n "$CODECOV_BINARY_LOCATION" ];

0 commit comments

Comments
 (0)