Skip to content

feat: allow for config of which CLI to use #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseph-sentry merged 2 commits into from
May 15, 2025
Merged

feat: allow for config of which CLI to use #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
596fe93
feat: allow for config of which CLI to use
joseph-sentry Apr 17, 2025
35faf6a
fix: address feedback
joseph-sentry Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions dist/codecov.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ CODECOV_WRAPPER_VERSION="0.2.6"
CODECOV_VERSION="${CODECOV_VERSION:-latest}"
CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}"
CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}"
CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov-cli"}
say " _____ _
/ ____| | |
| | ___ __| | ___ ___ _____ __
Expand All @@ -49,6 +50,10 @@ say " _____ _
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
$r Wrapper-$CODECOV_WRAPPER_VERSION$x
"
if [[ "$CODECOV_CLI_TYPE" != "codecov-cli" && "$CODECOV_CLI_TYPE" != "sentry-prevent-cli" ]]; then
echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov-cli' or 'sentry-prevent-cli'"
exit 1
fi
if [ -n "$CODECOV_BINARY" ];
then
if [ -f "$CODECOV_BINARY" ];
Expand All @@ -60,11 +65,11 @@ then
fi
elif [ "$CODECOV_USE_PYPI" == "true" ];
then
if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then
if ! pip install "${CODECOV_CLI_TYPE}$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION")"; then
exit_if_error "Could not install via pypi."
exit
fi
CODECOV_COMMAND="codecovcli"
CODECOV_COMMAND="${CODECOV_CLI_TYPE}"
else
if [ -n "$CODECOV_OS" ];
then
Expand All @@ -80,7 +85,7 @@ else
[[ $(arch) == "aarch64" && $family == "linux" ]] && CODECOV_OS+="-arm64"
say "$g==>$x Detected $b${CODECOV_OS}$x"
fi
CODECOV_FILENAME="codecov"
CODECOV_FILENAME="${CODECOV_CLI_TYPE%-cli}"
[[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe"
CODECOV_COMMAND="./$CODECOV_FILENAME"
[[ $CODECOV_OS == "macos" ]] && \
Expand Down Expand Up @@ -129,11 +134,11 @@ fi
if [ -n "$CODECOV_BINARY_LOCATION" ];
then
mkdir -p "$CODECOV_BINARY_LOCATION" && mv "$CODECOV_FILENAME" $_
say "$g==>$x Codecov binary moved to ${CODECOV_BINARY_LOCATION}"
say "$g==>$x ${CODECOV_CLI_TYPE} binary moved to ${CODECOV_BINARY_LOCATION}"
fi
if [ "$CODECOV_DOWNLOAD_ONLY" = "true" ];
then
say "$g==>$x Codecov download only called. Exiting..."
say "$g==>$x ${CODECOV_CLI_TYPE} download only called. Exiting..."
fi
CODECOV_CLI_ARGS=()
CODECOV_CLI_ARGS+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
Expand Down
1 change: 1 addition & 0 deletions env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CODECOV_ARGS
CODECOV_BINARY
CODECOV_BINARY_LOCATION
CODECOV_CLI_ARGS
CODECOV_CLI_TYPE
CODECOV_COMMAND
CODECOV_DOWNLOAD_ONLY
CODECOV_EXCLUDES
Expand Down
6 changes: 3 additions & 3 deletions scripts/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ then
fi
elif [ "$CODECOV_USE_PYPI" == "true" ];
then
if ! pip install codecov-cli"$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION" )"; then
if ! pip install "${CODECOV_CLI_TYPE}$([ "$CODECOV_VERSION" == "latest" ] && echo "" || echo "==$CODECOV_VERSION")"; then
exit_if_error "Could not install via pypi."
exit
fi
CODECOV_COMMAND="codecovcli"
CODECOV_COMMAND="${CODECOV_CLI_TYPE}"
else
if [ -n "$CODECOV_OS" ];
then
Expand All @@ -32,7 +32,7 @@ else
say "$g==>$x Detected $b${CODECOV_OS}$x"
fi

CODECOV_FILENAME="codecov"
CODECOV_FILENAME="${CODECOV_CLI_TYPE%-cli}"
[[ $CODECOV_OS == "windows" ]] && CODECOV_FILENAME+=".exe"
CODECOV_COMMAND="./$CODECOV_FILENAME"
[[ $CODECOV_OS == "macos" ]] && \
Expand Down
6 changes: 6 additions & 0 deletions scripts/set_defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CODECOV_WRAPPER_VERSION="0.2.6"
CODECOV_VERSION="${CODECOV_VERSION:-latest}"
CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}"
CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}"
CODECOV_CLI_TYPE=${CODECOV_CLI_TYPE:-"codecov-cli"}
Copy link

@spalmurray spalmurray May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL about :- huge

Copy link

@spalmurray spalmurray May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:-P


say " _____ _
/ ____| | |
Expand All @@ -13,3 +14,8 @@ say " _____ _
\\_____\\___/ \\__,_|\\___|\\___\\___/ \\_/
$r Wrapper-$CODECOV_WRAPPER_VERSION$x
"

if [[ "$CODECOV_CLI_TYPE" != "codecov-cli" && "$CODECOV_CLI_TYPE" != "sentry-prevent-cli" ]]; then
echo "Invalid CODECOV_CLI_TYPE: '$CODECOV_CLI_TYPE'. Must be 'codecov-cli' or 'sentry-prevent-cli'"
exit 1
fi
4 changes: 2 additions & 2 deletions scripts/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ fi
if [ -n "$CODECOV_BINARY_LOCATION" ];
then
mkdir -p "$CODECOV_BINARY_LOCATION" && mv "$CODECOV_FILENAME" $_
say "$g==>$x Codecov binary moved to ${CODECOV_BINARY_LOCATION}"
say "$g==>$x ${CODECOV_CLI_TYPE} binary moved to ${CODECOV_BINARY_LOCATION}"
fi

if [ "$CODECOV_DOWNLOAD_ONLY" = "true" ];
then
say "$g==>$x Codecov download only called. Exiting..."
say "$g==>$x ${CODECOV_CLI_TYPE} download only called. Exiting..."
fi