diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml deleted file mode 100644 index 80c04aca8..000000000 --- a/.github/workflows/enforce-license-compliance.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Enforce License Compliance - -on: - pull_request: - branches: [main] - -jobs: - enforce-license-compliance: - runs-on: ubuntu-latest - steps: - - name: 'Enforce License Compliance' - uses: getsentry/action-enforce-license-compliance@57ba820387a1a9315a46115ee276b2968da51f3d # main - with: - fossa_api_key: ${{ secrets.FOSSA_API_KEY }} diff --git a/Makefile b/Makefile index f335ab324..442b9a7d4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ deploy: $(eval VERSION := $(shell cat src/version)) - git tag -d v5 - git push origin :v5 - git tag v5 + git tag -d v7 + git push origin :v7 + git tag v7 git tag v$(VERSION) -s -m "" git push origin --tags diff --git a/README.md b/README.md index c0d3744da..245eb5527 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,14 @@ ### Easily upload coverage reports to Codecov from GitHub Actions +## v7 Release + +`v7` of the Codecov GitHub Action bumps the [Codecov Wrapper](https://github.com/codecov/wrapper) submodule, which now fetches the Codecov Uploader PGP verification key from the `codecovsecops` Keybase account. + +## v6 Release + +`v6` of the Codecov GitHub Action support node24 + ## v5 Release `v5` of the Codecov GitHub Action will use the [Codecov Wrapper](https://github.com/codecov/wrapper) to encapsulate the [CLI](https://github.com/codecov/codecov-cli). This will help ensure that the Action gets updates quicker. diff --git a/action.yml b/action.yml index 54c81958f..b247abebf 100644 --- a/action.yml +++ b/action.yml @@ -177,6 +177,8 @@ runs: steps: - name: Check system dependencies shell: sh + env: + INPUT_SKIP_VALIDATION: ${{ inputs.skip_validation }} run: | missing_deps="" @@ -188,7 +190,7 @@ runs: done # Check for gpg only if validation is not being skipped - if [ "${{ inputs.skip_validation }}" != "true" ]; then + if [ "$INPUT_SKIP_VALIDATION" != "true" ]; then if ! command -v gpg >/dev/null 2>&1; then missing_deps="$missing_deps gpg" fi @@ -230,7 +232,7 @@ runs: GITHUB_REPOSITORY: ${{ github.repository }} - name: Get OIDC token - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 id: oidc with: script: | @@ -245,24 +247,27 @@ runs: - name: Get and set token shell: bash run: | - if [ "${{ inputs.use_oidc }}" == 'true' ] && [ "$CC_FORK" != 'true' ]; + if [ "$INPUT_USE_OIDC" == 'true' ] && [ "$CC_FORK" != 'true' ]; then echo "CC_TOKEN=$CC_OIDC_TOKEN" >> "$GITHUB_ENV" - elif [ -n "${{ env.CODECOV_TOKEN }}" ]; + elif [ -n "$INPUT_CODECOV_TOKEN" ]; then echo -e "\033[0;32m==>\033[0m Token set from env" - echo "CC_TOKEN=${{ env.CODECOV_TOKEN }}" >> "$GITHUB_ENV" + echo "CC_TOKEN=$INPUT_CODECOV_TOKEN" >> "$GITHUB_ENV" else - if [ -n "${{ inputs.token }}" ]; + if [ -n "$INPUT_TOKEN" ]; then echo -e "\033[0;32m==>\033[0m Token set from input" - CC_TOKEN=$(echo "${{ inputs.token }}" | tr -d '\n') + CC_TOKEN=$(echo "$INPUT_TOKEN" | tr -d '\n') echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV" fi fi env: CC_OIDC_TOKEN: ${{ steps.oidc.outputs.result }} CC_OIDC_AUDIENCE: ${{ inputs.url || 'https://codecov.io' }} + INPUT_USE_OIDC: ${{ inputs.use_oidc }} + INPUT_TOKEN: ${{ inputs.token }} + INPUT_CODECOV_TOKEN: ${{ env.CODECOV_TOKEN }} - name: Override branch for forks shell: bash diff --git a/dist/codecov.sh b/dist/codecov.sh index 0b7717197..b7eba518e 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -37,7 +37,7 @@ g="\033[0;32m" # info/debug r="\033[0;31m" # errors x="\033[0m" retry="--retry 5 --retry-delay 2" -CC_WRAPPER_VERSION="0.2.7" +CC_WRAPPER_VERSION="0.2.9" CC_VERSION="${CC_VERSION:-latest}" CC_FAIL_ON_ERROR="${CC_FAIL_ON_ERROR:-false}" CC_RUN_CMD="${CC_RUN_CMD:-upload-coverage}" @@ -69,7 +69,13 @@ then exit_if_error "Could not install via pypi." exit fi - CC_COMMAND="${CC_CLI_TYPE}" + if [[ "$CC_CLI_TYPE" == "codecov-cli" ]]; then + CC_COMMAND="codecovcli" + elif [[ "$CC_CLI_TYPE" == "sentry-prevent-cli" ]]; then + CC_COMMAND="sentry-prevent-cli" + else + CC_COMMAND="${CC_CLI_TYPE}" + fi else if [ -n "$CC_OS" ]; then @@ -110,7 +116,7 @@ then chmod +x "$CC_COMMAND" fi else - echo "$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)" | \ + echo "$(curl -s https://keybase.io/codecovsecops/pgp_keys.asc)" | \ gpg --no-default-keyring --import # One-time step say "$g==>$x Verifying GPG signature integrity" diff --git a/src/scripts b/src/scripts index 473e29246..bad8df56c 160000 --- a/src/scripts +++ b/src/scripts @@ -1 +1 @@ -Subproject commit 473e2924695f5dbe1cca4a5f6f8a7182c2ddadc5 +Subproject commit bad8df56cd845fa9c6115a924bbd3215e1926ec8 diff --git a/src/version b/src/version index c8f1d098d..66ce77b7e 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -5.5.4 +7.0.0