Skip to content

Commit 9ae0a7e

Browse files
jvialljviall
committed
use v0.2.4 of submodule
1 parent f03e1e7 commit 9ae0a7e

File tree

2 files changed

+99
-108
lines changed

2 files changed

+99
-108
lines changed

‎dist/codecov.sh‎

Lines changed: 98 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ g="\033[0;32m" # info/debug
3737
r="\033[0;31m" # errors
3838
x="\033[0m"
3939
retry="--retry 5 --retry-delay 2"
40-
CC_WRAPPER_VERSION="0.2.7"
40+
CC_WRAPPER_VERSION="0.2.4"
4141
CC_VERSION="${CC_VERSION:-latest}"
4242
CC_FAIL_ON_ERROR="${CC_FAIL_ON_ERROR:-false}"
4343
CC_RUN_CMD="${CC_RUN_CMD:-upload-coverage}"
44-
CC_CLI_TYPE=${CC_CLI_TYPE:-"codecov-cli"}
4544
say " _____ _
4645
/ ____| | |
4746
| | ___ __| | ___ ___ _____ __
@@ -50,26 +49,22 @@ say " _____ _
5049
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
5150
$r Wrapper-$CC_WRAPPER_VERSION$x
5251
"
53-
if [[ "$CC_CLI_TYPE" != "codecov-cli" && "$CC_CLI_TYPE" != "sentry-prevent-cli" ]]; then
54-
echo "Invalid CC_CLI_TYPE: '$CC_CLI_TYPE'. Must be 'codecov-cli' or 'sentry-prevent-cli'"
55-
exit 1
56-
fi
5752
if [ -n "$CC_BINARY" ];
5853
then
5954
if [ -f "$CC_BINARY" ];
6055
then
61-
CC_FILENAME=$CC_BINARY
62-
CC_COMMAND=$CC_BINARY
56+
c_filename=$CC_BINARY
57+
c_command=$CC_BINARY
6358
else
6459
exit_if_error "Could not find binary file $CC_BINARY"
6560
fi
6661
elif [ "$CC_USE_PYPI" == "true" ];
6762
then
68-
if ! pip install "${CC_CLI_TYPE}$([ "$CC_VERSION" == "latest" ] && echo "" || echo "==$CC_VERSION")"; then
63+
if ! pip install codecov-cli"$([ "$CC_VERSION" == "latest" ] && echo "" || echo "==$CC_VERSION" )"; then
6964
exit_if_error "Could not install via pypi."
7065
exit
7166
fi
72-
CC_COMMAND="${CC_CLI_TYPE}"
67+
c_command="codecovcli"
7368
else
7469
if [ -n "$CC_OS" ];
7570
then
@@ -85,17 +80,17 @@ else
8580
[[ $(arch) == "aarch64" && $family == "linux" ]] && CC_OS+="-arm64"
8681
say "$g==>$x Detected $b${CC_OS}$x"
8782
fi
88-
CC_FILENAME="${CC_CLI_TYPE%-cli}"
89-
[[ $CC_OS == "windows" ]] && CC_FILENAME+=".exe"
90-
CC_COMMAND="./$CC_FILENAME"
83+
c_filename="codecov"
84+
[[ $CC_OS == "windows" ]] && c_filename+=".exe"
85+
c_command="./$c_filename"
9186
[[ $CC_OS == "macos" ]] && \
9287
! command -v gpg 2>&1 >/dev/null && \
9388
HOMEBREW_NO_AUTO_UPDATE=1 brew install gpg
94-
CC_URL="${CC_CLI_URL:-https://cli.codecov.io}"
95-
CC_URL="$CC_URL/${CC_VERSION}"
96-
CC_URL="$CC_URL/${CC_OS}/${CC_FILENAME}"
97-
say "$g ->$x Downloading $b${CC_URL}$x"
98-
curl -O $retry "$CC_URL"
89+
c_url="${CC_CLI_URL:-https://cli.codecov.io}"
90+
c_url="$c_url/${CC_VERSION}"
91+
c_url="$c_url/${CC_OS}/${c_filename}"
92+
say "$g ->$x Downloading $b${c_url}$x"
93+
curl -O $retry "$c_url"
9994
say "$g==>$x Finishing downloading $b${CC_OS}:${CC_VERSION}$x"
10095
v_url="https://cli.codecov.io/api/${CC_OS}/${CC_VERSION}"
10196
v=$(curl $retry --retry-all-errors -s "$v_url" -H "Accept:application/json" | tr \{ '\n' | tr , '\n' | tr \} '\n' | grep "\"version\"" | awk -F'"' '{print $4}' | tail -1)
@@ -105,165 +100,161 @@ fi
105100
if [ "$CC_SKIP_VALIDATION" == "true" ] || [ -n "$CC_BINARY" ] || [ "$CC_USE_PYPI" == "true" ];
106101
then
107102
say "$r==>$x Bypassing validation..."
108-
if [ "$CC_SKIP_VALIDATION" == "true" ];
109-
then
110-
chmod +x "$CC_COMMAND"
111-
fi
112103
else
113-
echo "$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)" | \
104+
CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
105+
echo "${CC_PUBLIC_PGP_KEY}" | \
114106
gpg --no-default-keyring --import
115107
# One-time step
116108
say "$g==>$x Verifying GPG signature integrity"
117109
sha_url="https://cli.codecov.io"
118110
sha_url="${sha_url}/${CC_VERSION}/${CC_OS}"
119-
sha_url="${sha_url}/${CC_FILENAME}.SHA256SUM"
111+
sha_url="${sha_url}/${c_filename}.SHA256SUM"
120112
say "$g ->$x Downloading $b${sha_url}$x"
121113
say "$g ->$x Downloading $b${sha_url}.sig$x"
122114
say " "
123115
curl -Os $retry --connect-timeout 2 "$sha_url"
124116
curl -Os $retry --connect-timeout 2 "${sha_url}.sig"
125-
if ! gpg --verify "${CC_FILENAME}.SHA256SUM.sig" "${CC_FILENAME}.SHA256SUM";
117+
if ! gpg --verify "${c_filename}.SHA256SUM.sig" "${c_filename}.SHA256SUM";
126118
then
127119
exit_if_error "Could not verify signature. Please contact Codecov if problem continues"
128120
fi
129-
if ! (shasum -a 256 -c "${CC_FILENAME}.SHA256SUM" 2>/dev/null || \
130-
sha256sum -c "${CC_FILENAME}.SHA256SUM");
121+
if ! (shasum -a 256 -c "${c_filename}.SHA256SUM" 2>/dev/null || \
122+
sha256sum -c "${c_filename}.SHA256SUM");
131123
then
132124
exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues"
133125
fi
134126
say "$g==>$x CLI integrity verified"
135127
say
136-
chmod +x "$CC_COMMAND"
128+
chmod +x "$c_command"
137129
fi
138130
if [ -n "$CC_BINARY_LOCATION" ];
139131
then
140-
mkdir -p "$CC_BINARY_LOCATION" && mv "$CC_FILENAME" $_
141-
say "$g==>$x ${CC_CLI_TYPE} binary moved to ${CC_BINARY_LOCATION}"
132+
mkdir -p "$CC_BINARY_LOCATION" && mv "$c_filename" $_
133+
say "$g==>$x Codecov binary moved to ${CC_BINARY_LOCATION}"
142134
fi
143135
if [ "$CC_DOWNLOAD_ONLY" = "true" ];
144136
then
145-
say "$g==>$x ${CC_CLI_TYPE} download only called. Exiting..."
146-
exit
137+
say "$g==>$x Codecov download only called. Exiting..."
147138
fi
148-
CC_CLI_ARGS=()
149-
CC_CLI_ARGS+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
150-
CC_CLI_ARGS+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
139+
c_cli_args=()
140+
c_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
141+
c_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
151142
if [ -n "$CC_YML_PATH" ]
152143
then
153-
CC_CLI_ARGS+=( "--codecov-yml-path" )
154-
CC_CLI_ARGS+=( "$CC_YML_PATH" )
144+
c_cli_args+=( "--codecov-yml-path" )
145+
c_cli_args+=( "$CC_YML_PATH" )
146+
fi
147+
c_cli_args+=( $(write_bool_args CC_DISABLE_TELEM) )
148+
c_cli_args+=( $(write_bool_args CC_VERBOSE) )
149+
if [ -n "$CC_TOKEN_VAR" ];
150+
then
151+
token="$(eval echo \$$CC_TOKEN_VAR)"
152+
else
153+
token="$(eval echo $CC_TOKEN)"
154+
fi
155+
say "$g ->$x Token length: ${#token}"
156+
token_str=""
157+
token_arg=()
158+
if [ -n "$token" ];
159+
then
160+
token_str+=" -t <redacted>"
161+
token_arg+=( " -t " "$token")
155162
fi
156-
CC_CLI_ARGS+=( $(write_bool_args CC_DISABLE_TELEM) )
157-
CC_CLI_ARGS+=( $(write_bool_args CC_VERBOSE) )
158-
CC_ARGS=()
163+
c_args=()
159164
if [ "$CC_RUN_CMD" == "upload-coverage" ]; then
160165
# Args for create commit
161-
CC_ARGS+=( $(write_bool_args CC_FAIL_ON_ERROR) )
162-
CC_ARGS+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
163-
CC_ARGS+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
164-
CC_ARGS+=( $(k_arg PR) $(v_arg PR))
165-
CC_ARGS+=( $(k_arg SHA) $(v_arg SHA))
166-
CC_ARGS+=( $(k_arg SLUG) $(v_arg SLUG))
166+
c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
167+
c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
168+
c_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
169+
c_args+=( $(k_arg PR) $(v_arg PR))
170+
c_args+=( $(k_arg SHA) $(v_arg SHA))
171+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
167172
# Args for create report
168-
CC_ARGS+=( $(k_arg CODE) $(v_arg CODE))
173+
c_args+=( $(k_arg CODE) $(v_arg CODE))
169174
# Args for do upload
170-
CC_ARGS+=( $(k_arg ENV) $(v_arg ENV))
175+
c_args+=( $(k_arg ENV) $(v_arg ENV))
171176
OLDIFS=$IFS;IFS=,
172-
CC_ARGS+=( $(k_arg BRANCH) $(v_arg BRANCH))
173-
CC_ARGS+=( $(k_arg BUILD) $(v_arg BUILD))
174-
CC_ARGS+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
175-
CC_ARGS+=( $(k_arg DIR) $(v_arg DIR))
176-
CC_ARGS+=( $(write_bool_args CC_DISABLE_FILE_FIXES) )
177-
CC_ARGS+=( $(write_bool_args CC_DISABLE_SEARCH) )
178-
CC_ARGS+=( $(write_bool_args CC_DRY_RUN) )
177+
c_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
178+
c_args+=( $(k_arg BUILD) $(v_arg BUILD))
179+
c_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
180+
c_args+=( $(k_arg DIR) $(v_arg DIR))
181+
c_args+=( $(write_bool_args CC_DISABLE_FILE_FIXES) )
182+
c_args+=( $(write_bool_args CC_DISABLE_SEARCH) )
183+
c_args+=( $(write_bool_args CC_DRY_RUN) )
179184
if [ -n "$CC_EXCLUDES" ];
180185
then
181186
for directory in $CC_EXCLUDES; do
182-
CC_ARGS+=( "--exclude" "$directory" )
187+
c_args+=( "--exclude" "$directory" )
183188
done
184189
fi
185190
if [ -n "$CC_FILES" ];
186191
then
187192
for file in $CC_FILES; do
188-
CC_ARGS+=( "--file" "$file" )
193+
c_args+=( "--file" "$file" )
189194
done
190195
fi
191196
if [ -n "$CC_FLAGS" ];
192197
then
193198
for flag in $CC_FLAGS; do
194-
CC_ARGS+=( "--flag" "$flag" )
199+
c_args+=( "--flag" "$flag" )
195200
done
196201
fi
197-
CC_ARGS+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
198-
CC_ARGS+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
199-
CC_ARGS+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
200-
CC_ARGS+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
201-
CC_ARGS+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) )
202-
CC_ARGS+=( $(write_bool_args CC_RECURSE_SUBMODULES) )
203-
CC_ARGS+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
204-
CC_ARGS+=( $(write_bool_args CC_LEGACY) )
202+
c_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
203+
c_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
204+
c_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
205+
c_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
206+
c_args+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) )
207+
c_args+=( $(write_bool_args CC_RECURSE_SUBMODULES) )
208+
c_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
209+
c_args+=( $(write_bool_args CC_LEGACY) )
205210
if [ -n "$CC_NAME" ];
206211
then
207-
CC_ARGS+=( "--name" "$CC_NAME" )
212+
c_args+=( "--name" "$CC_NAME" )
208213
fi
209-
CC_ARGS+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
210-
CC_ARGS+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
211-
CC_ARGS+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
214+
c_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
215+
c_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
216+
c_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
212217
if [ -n "$CC_PLUGINS" ];
213218
then
214219
for plugin in $CC_PLUGINS; do
215-
CC_ARGS+=( "--plugin" "$plugin" )
220+
c_args+=( "--plugin" "$plugin" )
216221
done
217222
fi
218-
CC_ARGS+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
219-
CC_ARGS+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
223+
c_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
224+
c_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
220225
IFS=$OLDIFS
221226
elif [ "$CC_RUN_CMD" == "empty-upload" ]; then
222-
CC_ARGS+=( $(k_arg BRANCH) $(v_arg BRANCH))
223-
CC_ARGS+=( $(write_bool_args CC_FAIL_ON_ERROR) )
224-
CC_ARGS+=( $(write_bool_args CC_FORCE) )
225-
CC_ARGS+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
226-
CC_ARGS+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
227-
CC_ARGS+=( $(k_arg PR) $(v_arg PR))
228-
CC_ARGS+=( $(k_arg SHA) $(v_arg SHA))
229-
CC_ARGS+=( $(k_arg SLUG) $(v_arg SLUG))
227+
c_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
228+
c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
229+
c_args+=( $(write_bool_args CC_FORCE) )
230+
c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
231+
c_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
232+
c_args+=( $(k_arg PR) $(v_arg PR))
233+
c_args+=( $(k_arg SHA) $(v_arg SHA))
234+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
230235
elif [ "$CC_RUN_CMD" == "pr-base-picking" ]; then
231-
CC_ARGS+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
232-
CC_ARGS+=( $(k_arg PR) $(v_arg PR))
233-
CC_ARGS+=( $(k_arg SLUG) $(v_arg SLUG))
234-
CC_ARGS+=( $(k_arg SERVICE) $(v_arg SERVICE))
236+
c_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
237+
c_args+=( $(k_arg PR) $(v_arg PR))
238+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
239+
c_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
235240
elif [ "$CC_RUN_CMD" == "send-notifications" ]; then
236-
CC_ARGS+=( $(k_arg SHA) $(v_arg SHA))
237-
CC_ARGS+=( $(write_bool_args CC_FAIL_ON_ERROR) )
238-
CC_ARGS+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
239-
CC_ARGS+=( $(k_arg SLUG) $(v_arg SLUG))
241+
c_args+=( $(k_arg SHA) $(v_arg SHA))
242+
c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
243+
c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
244+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
240245
else
241246
exit_if_error "Invalid run command specified: $CC_RUN_CMD"
242247
exit
243248
fi
244249
unset NODE_OPTIONS
245250
# github.com/codecov/uploader/issues/475
246-
if [ -n "$CC_TOKEN_VAR" ];
247-
then
248-
token="$(eval echo \$$CC_TOKEN_VAR)"
249-
else
250-
token="$(eval echo $CC_TOKEN)"
251-
fi
252-
say "$g ->$x Token length: ${#token}"
253-
token_str=""
254-
token_arg=()
255-
if [ -n "$token" ];
256-
then
257-
token_str+=" -t <redacted>"
258-
token_arg+=( " -t " "$token")
259-
fi
260251
say "$g==>$x Running $CC_RUN_CMD"
261-
say " $b$CC_COMMAND $(echo "${CC_CLI_ARGS[@]}") $CC_RUN_CMD$token_str $(echo "${CC_ARGS[@]}")$x"
262-
if ! $CC_COMMAND \
263-
${CC_CLI_ARGS[*]} \
252+
say " $b$c_command $(echo "${c_cli_args[@]}") $CC_RUN_CMD$token_str $(echo "${c_args[@]}")$x"
253+
if ! $c_command \
254+
${c_cli_args[*]} \
264255
${CC_RUN_CMD} \
265256
${token_arg[*]} \
266-
"${CC_ARGS[@]}";
257+
"${c_args[@]}";
267258
then
268259
exit_if_error "Failed to run $CC_RUN_CMD"
269260
fi

‎src/scripts‎

0 commit comments

Comments
 (0)