diff --git a/.github/workflows/push-tag-to-extensions.yml b/.github/workflows/push-tag-to-extensions.yml index a0dd1be..5ea1802 100644 --- a/.github/workflows/push-tag-to-extensions.yml +++ b/.github/workflows/push-tag-to-extensions.yml @@ -1,4 +1,5 @@ --- +# yamllint disable rule:line-length name: Push new tagged version on: # yamllint disable-line rule:truthy workflow_dispatch: diff --git a/.github/workflows/push-tag.yml b/.github/workflows/push-tag.yml index f88a50d..4c054bc 100644 --- a/.github/workflows/push-tag.yml +++ b/.github/workflows/push-tag.yml @@ -1,4 +1,4 @@ - +--- # yamllint disable rule:line-length name: Push tag to extension on: # yamllint disable-line rule:truthy diff --git a/dist/codecov.sh b/dist/codecov.sh index 5d3c64a..6f534ea 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CC_WRAPPER_VERSION="0.0.22" +CC_WRAPPER_VERSION="0.0.23" set +u say() { echo -e "$1" @@ -80,13 +80,16 @@ else say "$g ->$x Downloading $b${cc_url}$x" curl -Os $cc_url say "$g==>$x Finishing downloading $b${cc_os}:${CC_VERSION}$x" + version_url="https://cli.codecov.io/${cc_os}/${CC_VERSION}" + version=$(curl -s $version_url -H "Accept:application/json" | jq -r '.version') + say " Version: $b$version$x" say " " fi if [ "$CC_SKIP_VALIDATION" = "true" ] || [ -n "$CC_BINARY" ]; then say "$r==>$x Bypassing validation as requested by user" else -CC_PUBLIC_PGP_KEY=$(curl https://keybase.io/codecovsecurity/pgp_keys.asc) +CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc) echo "${CC_PUBLIC_PGP_KEY}" | \ gpg --no-default-keyring --import # One-time step diff --git a/hooks/pre-commit b/hooks/pre-commit index 6dfdc34..c9daeb7 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -2,6 +2,7 @@ set -e +yamllint . python package.py git add dist/codecov.sh git add env diff --git a/scripts/download.sh b/scripts/download.sh index 356e73c..59b16f7 100755 --- a/scripts/download.sh +++ b/scripts/download.sh @@ -40,7 +40,10 @@ else codecov_url="$codecov_url/${codecov_os}/${codecov_filename}" say "$g ->$x Downloading $b${codecov_url}$x" curl -Os $codecov_url - say "$g==>$x Finishing downloading $b${codecov_os}:${CODECOV_VERSION}$x" + + version_url="https://cli.codecov.io/${codecov_os}/${CODECOV_VERSION}" + version=$(curl -s $version_url -H "Accept:application/json" | jq -r '.version') + say " Version: $b$version$x" say " " fi diff --git a/scripts/set_validation_key.sh b/scripts/set_validation_key.sh index dd4c079..b98f3cb 100755 --- a/scripts/set_validation_key.sh +++ b/scripts/set_validation_key.sh @@ -1 +1 @@ -CODECOV_PUBLIC_PGP_KEY=$(curl https://keybase.io/codecovsecurity/pgp_keys.asc) +CODECOV_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc) diff --git a/scripts/version.sh b/scripts/version.sh index bd12996..0f3a7fc 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -CODECOV_WRAPPER_VERSION="0.0.22" +CODECOV_WRAPPER_VERSION="0.0.23"