Skip to content

Commit e4cdaba

Browse files
thomasrockhu-codecovthomasrockhu-codecov
authored
fix: use the github core methods (#1807)
1 parent f95a404 commit e4cdaba

File tree

2 files changed

+92
-84
lines changed

2 files changed

+92
-84
lines changed

‎action.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -202,16 +202,23 @@ runs:
202202
GITHUB_EVENT_PULL_REQUEST_HEAD_REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
203203
GITHUB_REPOSITORY: ${{ github.repository }}
204204

205+
- name: Get OIDC token
206+
if: ${{ inputs.use_oidc }}
207+
uses: actions/github-script@v7
208+
id: oidc
209+
with:
210+
script: |
211+
const id_token = await core.getIDToken(process.env.CC_OIDC_AUDIENCE)
212+
return id_token
213+
env:
214+
CC_OIDC_AUDIENCE: ${{ inputs.url || 'https://codecov.io' }}
205215

206216
- name: Get and set token
207217
shell: bash
208218
run: |
209219
if [ "${{ inputs.use_oidc }}" == 'true' ] && [ "$CC_FORK" != 'true' ];
210220
then
211-
# {"count":1984,"value":"***"}
212-
echo -e "\033[0;32m==>\033[0m Requesting OIDC token from '$ACTIONS_ID_TOKEN_REQUEST_URL'"
213-
CC_TOKEN=$(curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=$CC_OIDC_AUDIENCE" | cut -d\" -f6)
214-
echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV"
221+
echo "CC_TOKEN=$CC_OIDC_TOKEN" >> "$GITHUB_ENV"
215222
elif [ -n "${{ env.CODECOV_TOKEN }}" ];
216223
then
217224
echo -e "\033[0;32m==>\033[0m Token set from env"
@@ -225,6 +232,7 @@ runs:
225232
fi
226233
fi
227234
env:
235+
CC_OIDC_TOKEN: ${{ steps.oidc.outputs.result }}
228236
CC_OIDC_AUDIENCE: ${{ inputs.url || 'https://codecov.io' }}
229237

230238
- name: Override branch for forks

‎dist/codecov.sh

+80-80
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
CC_WRAPPER_VERSION="0.2.0"
2+
CC_WRAPPER_VERSION="0.2.1"
33
set +u
44
say() {
55
echo -e "$1"
@@ -52,8 +52,8 @@ if [ -n "$CC_BINARY" ];
5252
then
5353
if [ -f "$CC_BINARY" ];
5454
then
55-
cc_filename=$CC_BINARY
56-
cc_command=$CC_BINARY
55+
c_filename=$CC_BINARY
56+
c_command=$CC_BINARY
5757
else
5858
exit_if_error "Could not find binary file $CC_BINARY"
5959
fi
@@ -63,7 +63,7 @@ then
6363
exit_if_error "Could not install via pypi."
6464
exit
6565
fi
66-
cc_command="codecovcli"
66+
c_command="codecovcli"
6767
else
6868
if [ -n "$CC_OS" ];
6969
then
@@ -79,17 +79,17 @@ else
7979
[[ $(arch) == "aarch64" && $family == "linux" ]] && CC_OS+="-arm64"
8080
say "$g==>$x Detected $b${CC_OS}$x"
8181
fi
82-
cc_filename="codecov"
83-
[[ $CC_OS == "windows" ]] && cc_filename+=".exe"
84-
cc_command="./$cc_filename"
82+
c_filename="codecov"
83+
[[ $CC_OS == "windows" ]] && c_filename+=".exe"
84+
c_command="./$c_filename"
8585
[[ $CC_OS == "macos" ]] && \
8686
! command -v gpg 2>&1 >/dev/null && \
8787
HOMEBREW_NO_AUTO_UPDATE=1 brew install gpg
88-
cc_url="https://cli.codecov.io"
89-
cc_url="$cc_url/${CC_VERSION}"
90-
cc_url="$cc_url/${CC_OS}/${cc_filename}"
91-
say "$g ->$x Downloading $b${cc_url}$x"
92-
curl -O --retry 5 --retry-delay 2 "$cc_url"
88+
c_url="https://cli.codecov.io"
89+
c_url="$c_url/${CC_VERSION}"
90+
c_url="$c_url/${CC_OS}/${c_filename}"
91+
say "$g ->$x Downloading $b${c_url}$x"
92+
curl -O --retry 5 --retry-delay 2 "$c_url"
9393
say "$g==>$x Finishing downloading $b${CC_OS}:${CC_VERSION}$x"
9494
version_url="https://cli.codecov.io/api/${CC_OS}/${CC_VERSION}"
9595
version=$(curl -s "$version_url" -H "Accept:application/json" | tr \{ '\n' | tr , '\n' | tr \} '\n' | grep "\"version\"" | awk -F'"' '{print $4}' | tail -1)
@@ -107,44 +107,44 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
107107
say "$g==>$x Verifying GPG signature integrity"
108108
sha_url="https://cli.codecov.io"
109109
sha_url="${sha_url}/${CC_VERSION}/${CC_OS}"
110-
sha_url="${sha_url}/${cc_filename}.SHA256SUM"
110+
sha_url="${sha_url}/${c_filename}.SHA256SUM"
111111
say "$g ->$x Downloading $b${sha_url}$x"
112112
say "$g ->$x Downloading $b${sha_url}.sig$x"
113113
say " "
114114
curl -Os --retry 5 --retry-delay 2 --connect-timeout 2 "$sha_url"
115115
curl -Os --retry 5 --retry-delay 2 --connect-timeout 2 "${sha_url}.sig"
116-
if ! gpg --verify "${cc_filename}.SHA256SUM.sig" "${cc_filename}.SHA256SUM";
116+
if ! gpg --verify "${c_filename}.SHA256SUM.sig" "${c_filename}.SHA256SUM";
117117
then
118118
exit_if_error "Could not verify signature. Please contact Codecov if problem continues"
119119
fi
120-
if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" 2>/dev/null || \
121-
sha256sum -c "${cc_filename}.SHA256SUM");
120+
if ! (shasum -a 256 -c "${c_filename}.SHA256SUM" 2>/dev/null || \
121+
sha256sum -c "${c_filename}.SHA256SUM");
122122
then
123123
exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues"
124124
fi
125125
say "$g==>$x CLI integrity verified"
126126
say
127-
chmod +x "$cc_command"
127+
chmod +x "$c_command"
128128
fi
129129
if [ -n "$CC_BINARY_LOCATION" ];
130130
then
131-
mkdir -p "$CC_BINARY_LOCATION" && mv "$cc_filename" $_
131+
mkdir -p "$CC_BINARY_LOCATION" && mv "$c_filename" $_
132132
say "$g==>$x Codecov binary moved to ${CC_BINARY_LOCATION}"
133133
fi
134134
if [ "$CC_DOWNLOAD_ONLY" = "true" ];
135135
then
136136
say "$g==>$x Codecov download only called. Exiting..."
137137
fi
138-
cc_cli_args=()
139-
cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
140-
cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
138+
c_cli_args=()
139+
c_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
140+
c_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
141141
if [ -n "$CC_YML_PATH" ]
142142
then
143-
cc_cli_args+=( "--codecov-yml-path" )
144-
cc_cli_args+=( "$CC_YML_PATH" )
143+
c_cli_args+=( "--codecov-yml-path" )
144+
c_cli_args+=( "$CC_YML_PATH" )
145145
fi
146-
cc_cli_args+=( $(write_bool_args CC_DISABLE_TELEM) )
147-
cc_cli_args+=( $(write_bool_args CC_VERBOSE) )
146+
c_cli_args+=( $(write_bool_args CC_DISABLE_TELEM) )
147+
c_cli_args+=( $(write_bool_args CC_VERBOSE) )
148148
if [ -n "$CC_TOKEN_VAR" ];
149149
then
150150
token="$(eval echo \$$CC_TOKEN_VAR)"
@@ -159,101 +159,101 @@ then
159159
token_str+=" -t <redacted>"
160160
token_arg+=( " -t " "$token")
161161
fi
162+
c_args=()
162163
if [ "$CC_RUN_CMD" == "upload-coverage" ]; then
163-
cc_args=()
164164
# Args for create commit
165-
cc_args+=( $(write_bool_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))
165+
c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
166+
c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
167+
c_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
168+
c_args+=( $(k_arg PR) $(v_arg PR))
169+
c_args+=( $(k_arg SHA) $(v_arg SHA))
170+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
171171
# Args for create report
172-
cc_args+=( $(k_arg CODE) $(v_arg CODE))
172+
c_args+=( $(k_arg CODE) $(v_arg CODE))
173173
# Args for do upload
174-
cc_args+=( $(k_arg ENV) $(v_arg ENV))
174+
c_args+=( $(k_arg ENV) $(v_arg ENV))
175175
OLDIFS=$IFS;IFS=,
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_bool_args CC_DISABLE_FILE_FIXES) )
181-
cc_args+=( $(write_bool_args CC_DISABLE_SEARCH) )
182-
cc_args+=( $(write_bool_args CC_DRY_RUN) )
176+
c_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
177+
c_args+=( $(k_arg BUILD) $(v_arg BUILD))
178+
c_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
179+
c_args+=( $(k_arg DIR) $(v_arg DIR))
180+
c_args+=( $(write_bool_args CC_DISABLE_FILE_FIXES) )
181+
c_args+=( $(write_bool_args CC_DISABLE_SEARCH) )
182+
c_args+=( $(write_bool_args CC_DRY_RUN) )
183183
if [ -n "$CC_EXCLUDES" ];
184184
then
185185
for directory in $CC_EXCLUDES; do
186-
cc_args+=( "--exclude" "$directory" )
186+
c_args+=( "--exclude" "$directory" )
187187
done
188188
fi
189189
if [ -n "$CC_FILES" ];
190190
then
191191
for file in $CC_FILES; do
192-
cc_args+=( "--file" "$file" )
192+
c_args+=( "--file" "$file" )
193193
done
194194
fi
195195
if [ -n "$CC_FLAGS" ];
196196
then
197197
for flag in $CC_FLAGS; do
198-
cc_args+=( "--flag" "$flag" )
198+
c_args+=( "--flag" "$flag" )
199199
done
200200
fi
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_bool_args CC_HANDLE_NO_REPORTS_FOUND) )
206-
cc_args+=( $(write_bool_args CC_RECURSE_SUBMODULES) )
207-
cc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
208-
cc_args+=( $(write_bool_args CC_LEGACY) )
201+
c_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
202+
c_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
203+
c_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
204+
c_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
205+
c_args+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) )
206+
c_args+=( $(write_bool_args CC_RECURSE_SUBMODULES) )
207+
c_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
208+
c_args+=( $(write_bool_args CC_LEGACY) )
209209
if [ -n "$CC_NAME" ];
210210
then
211-
cc_args+=( "--name" "$CC_NAME" )
211+
c_args+=( "--name" "$CC_NAME" )
212212
fi
213-
cc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
214-
cc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
215-
cc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
213+
c_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
214+
c_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
215+
c_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
216216
if [ -n "$CC_PLUGINS" ];
217217
then
218218
for plugin in $CC_PLUGINS; do
219-
cc_args+=( "--plugin" "$plugin" )
219+
c_args+=( "--plugin" "$plugin" )
220220
done
221221
fi
222-
cc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
223-
cc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
222+
c_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
223+
c_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
224224
IFS=$OLDIFS
225225
elif [ "$CC_RUN_CMD" == "empty-upload" ]; then
226-
cc_args=()
227-
cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
228-
cc_args+=( $(write_bool_args CC_FORCE) )
229-
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
230-
cc_args+=( $(k_arg SHA) $(v_arg SHA))
231-
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
226+
c_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
227+
c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
228+
c_args+=( $(write_bool_args CC_FORCE) )
229+
c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
230+
c_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
231+
c_args+=( $(k_arg PR) $(v_arg PR))
232+
c_args+=( $(k_arg SHA) $(v_arg SHA))
233+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
232234
elif [ "$CC_RUN_CMD" == "pr-base-picking" ]; then
233-
cc_args=()
234-
cc_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
235-
cc_args+=( $(k_arg PR) $(v_arg PR))
236-
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
237-
cc_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
235+
c_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA))
236+
c_args+=( $(k_arg PR) $(v_arg PR))
237+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
238+
c_args+=( $(k_arg SERVICE) $(v_arg SERVICE))
238239
elif [ "$CC_RUN_CMD" == "send-notifications" ]; then
239-
cc_args=()
240-
cc_args+=( $(k_arg SHA) $(v_arg SHA))
241-
cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
242-
cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
243-
cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
240+
c_args+=( $(k_arg SHA) $(v_arg SHA))
241+
c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) )
242+
c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
243+
c_args+=( $(k_arg SLUG) $(v_arg SLUG))
244244
else
245245
exit_if_error "Invalid run command specified: $CC_RUN_CMD"
246246
exit
247247
fi
248248
unset NODE_OPTIONS
249-
# https://github.com/codecov/uploader/issues/475
249+
# github.com/codecov/uploader/issues/475
250250
say "$g==>$x Running $CC_RUN_CMD"
251-
say " $b$cc_command $(echo "${cc_cli_args[@]}") $CC_RUN_CMD$token_str $(echo "${cc_args[@]}")$x"
252-
if ! $cc_command \
253-
${cc_cli_args[*]} \
251+
say " $b$c_command $(echo "${c_cli_args[@]}") $CC_RUN_CMD$token_str $(echo "${c_args[@]}")$x"
252+
if ! $c_command \
253+
${c_cli_args[*]} \
254254
${CC_RUN_CMD} \
255255
${token_arg[*]} \
256-
"${cc_args[@]}";
256+
"${c_args[@]}";
257257
then
258258
exit_if_error "Failed to run $CC_RUN_CMD"
259259
fi

0 commit comments

Comments
 (0)