WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 2a6a022

Browse files
thomasrockhu-codecovthomasrockhu-codecov
committed
Merge pull request #57 from codecov/th/refactor-for-orb
fix: refactor things for the orb
2 parents abc707d + 3de44d7 commit 2a6a022

File tree

9 files changed

+101
-88
lines changed

9 files changed

+101
-88
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
deploy:
2-
$(eval VERSION := $(shell cat scripts/version.sh | grep 'CODECOV_WRAPPER_VERSION=' | cut -d\" -f2))
2+
$(eval VERSION := $(shell cat scripts/set_defaults.sh | grep 'CODECOV_WRAPPER_VERSION=' | cut -d\" -f2))
33
git tag -d v0
44
git push origin :v0
55
git tag v0

‎dist/codecov.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env bash
2-
CC_WRAPPER_VERSION="0.2.2"
32
set +u
43
say() {
54
echo -e "$1"
@@ -38,17 +37,18 @@ g="\033[0;32m" # info/debug
3837
r="\033[0;31m" # errors
3938
x="\033[0m"
4039
retry="--retry 5 --retry-delay 2"
40+
CC_WRAPPER_VERSION="0.2.3"
41+
CC_VERSION="${CC_VERSION:-latest}"
42+
CC_FAIL_ON_ERROR="${CC_FAIL_ON_ERROR:-false}"
43+
CC_RUN_CMD="${CC_RUN_CMD:-upload-coverage}"
4144
say " _____ _
4245
/ ____| | |
4346
| | ___ __| | ___ ___ _____ __
4447
| | / _ \\ / _\` |/ _ \\/ __/ _ \\ \\ / /
4548
| |___| (_) | (_| | __/ (_| (_) \\ V /
4649
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
4750
$r Wrapper-$CC_WRAPPER_VERSION$x
48-
"
49-
CC_VERSION="${CC_VERSION:-latest}"
50-
CC_FAIL_ON_ERROR="${CC_FAIL_ON_ERROR:-false}"
51-
CC_RUN_CMD="${CC_RUN_CMD:-upload-coverage}"
51+
"
5252
if [ -n "$CC_BINARY" ];
5353
then
5454
if [ -f "$CC_BINARY" ];

‎scripts/run.sh‎

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

3-
. ./version.sh
3+
. ./set_funcs.sh
44
. ./set_defaults.sh
55
. ./download.sh
66
. ./validate.sh
7-
8-
. ./set_cli_args.sh
9-
. ./set_token.sh
7+
. ./set_args.sh
108
. ./run_command.sh

‎scripts/run_command.sh‎

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

3-
codecov_args=()
4-
if [ "$CODECOV_RUN_CMD" == "upload-coverage" ]; then
5-
. ./set_upload_coverage_args.sh
6-
elif [ "$CODECOV_RUN_CMD" == "empty-upload" ]; then
7-
. ./set_empty_upload_args.sh
8-
elif [ "$CODECOV_RUN_CMD" == "pr-base-picking" ]; then
9-
. ./set_pr_base_picking_args.sh
10-
elif [ "$CODECOV_RUN_CMD" == "send-notifications" ]; then
11-
. ./set_send_notifications_args.sh
12-
else
13-
exit_if_error "Invalid run command specified: $CODECOV_RUN_CMD"
14-
exit
15-
fi
16-
173
unset NODE_OPTIONS
184
# github.com/codecov/uploader/issues/475
195

‎scripts/set_args.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/usr/bin/env bash
2+
3+
codecov_cli_args=()
4+
5+
codecov_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
6+
codecov_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
7+
if [ -n "$CODECOV_YML_PATH" ]
8+
then
9+
codecov_cli_args+=( "--codecov-yml-path" )
10+
codecov_cli_args+=( "$CODECOV_YML_PATH" )
11+
fi
12+
codecov_cli_args+=( $(write_bool_args CODECOV_DISABLE_TELEM) )
13+
codecov_cli_args+=( $(write_bool_args CODECOV_VERBOSE) )
14+
15+
if [ -n "$CODECOV_TOKEN_VAR" ];
16+
then
17+
token="$(eval echo \$$CODECOV_TOKEN_VAR)"
18+
else
19+
token="$(eval echo $CODECOV_TOKEN)"
20+
fi
21+
say "$g ->$x Token length: ${#token}"
22+
token_str=""
23+
token_arg=()
24+
if [ -n "$token" ];
25+
then
26+
token_str+=" -t <redacted>"
27+
token_arg+=( " -t " "$token")
28+
fi
29+
30+
codecov_args=()
31+
if [ "$CODECOV_RUN_CMD" == "upload-coverage" ]; then
32+
. ./set_upload_coverage_args.sh
33+
elif [ "$CODECOV_RUN_CMD" == "empty-upload" ]; then
34+
. ./set_empty_upload_args.sh
35+
elif [ "$CODECOV_RUN_CMD" == "pr-base-picking" ]; then
36+
. ./set_pr_base_picking_args.sh
37+
elif [ "$CODECOV_RUN_CMD" == "send-notifications" ]; then
38+
. ./set_send_notifications_args.sh
39+
else
40+
exit_if_error "Invalid run command specified: $CODECOV_RUN_CMD"
41+
exit
42+
fi

‎scripts/set_cli_args.sh‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎scripts/set_defaults.sh‎

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

3-
set +u
4-
say() {
5-
echo -e "$1"
6-
}
7-
8-
exit_if_error() {
9-
say "$r==> $1$x"
10-
if [ "$CODECOV_FAIL_ON_ERROR" = true ];
11-
then
12-
say "$r Exiting...$x"
13-
exit 1;
14-
fi
15-
}
16-
17-
lower() {
18-
echo $(echo $1 | sed 's/CODECOV//' | sed 's/_/-/g' | tr '[:upper:]' '[:lower:]')
19-
}
20-
21-
k_arg() {
22-
if [ -n "$(eval echo \$"CODECOV_$1")" ];
23-
then
24-
echo "--$(lower "$1")"
25-
fi
26-
}
27-
28-
v_arg() {
29-
if [ -n "$(eval echo \$"CODECOV_$1")" ];
30-
then
31-
echo "$(eval echo \$"CODECOV_$1")"
32-
fi
33-
}
34-
35-
write_bool_args() {
36-
if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ];
37-
then
38-
echo "-$(lower $1)"
39-
fi
40-
}
41-
42-
b="\033[0;36m" # variables/constants
43-
g="\033[0;32m" # info/debug
44-
r="\033[0;31m" # errors
45-
x="\033[0m"
46-
retry="--retry 5 --retry-delay 2"
3+
CODECOV_WRAPPER_VERSION="0.2.3"
4+
CODECOV_VERSION="${CODECOV_VERSION:-latest}"
5+
CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}"
6+
CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}"
477

488
say " _____ _
499
/ ____| | |
@@ -52,8 +12,4 @@ say " _____ _
5212
| |___| (_) | (_| | __/ (_| (_) \\ V /
5313
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
5414
$r Wrapper-$CODECOV_WRAPPER_VERSION$x
55-
"
56-
57-
CODECOV_VERSION="${CODECOV_VERSION:-latest}"
58-
CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}"
59-
CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}"
15+
"

‎scripts/set_funcs.sh‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/usr/bin/env bash
2+
3+
set +u
4+
say() {
5+
echo -e "$1"
6+
}
7+
8+
exit_if_error() {
9+
say "$r==> $1$x"
10+
if [ "$CODECOV_FAIL_ON_ERROR" = true ];
11+
then
12+
say "$r Exiting...$x"
13+
exit 1;
14+
fi
15+
}
16+
17+
lower() {
18+
echo $(echo $1 | sed 's/CODECOV//' | sed 's/_/-/g' | tr '[:upper:]' '[:lower:]')
19+
}
20+
21+
k_arg() {
22+
if [ -n "$(eval echo \$"CODECOV_$1")" ];
23+
then
24+
echo "--$(lower "$1")"
25+
fi
26+
}
27+
28+
v_arg() {
29+
if [ -n "$(eval echo \$"CODECOV_$1")" ];
30+
then
31+
echo "$(eval echo \$"CODECOV_$1")"
32+
fi
33+
}
34+
35+
write_bool_args() {
36+
if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ];
37+
then
38+
echo "-$(lower $1)"
39+
fi
40+
}
41+
42+
b="\033[0;36m" # variables/constants
43+
g="\033[0;32m" # info/debug
44+
r="\033[0;31m" # errors
45+
x="\033[0m"
46+
retry="--retry 5 --retry-delay 2"

‎scripts/version.sh‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)