Skip to content
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

fix: update tokenless branch logic #1650

Merged
merged 12 commits into from
Nov 15, 2024
Merged

fix: update tokenless branch logic #1650

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7ff8c66
fix: update tokenless branch logic
thomasrockhu-codecov Nov 15, 2024
453bbab
fix: use the github context
thomasrockhu-codecov Nov 15, 2024
7bee4bb
fix: use double quotes
thomasrockhu-codecov Nov 15, 2024
23d74e4
fix: lots of quotes
thomasrockhu-codecov Nov 15, 2024
7458bec
fix: ai fixes
thomasrockhu-codecov Nov 15, 2024
66a562f
fix: just shove it in
thomasrockhu-codecov Nov 15, 2024
41afb5f
fix: more ai fixes
thomasrockhu-codecov Nov 15, 2024
5873b3f
fix: missing double quote
thomasrockhu-codecov Nov 15, 2024
9301ab0
fix: more clenaup
thomasrockhu-codecov Nov 15, 2024
32a6129
fix: add CC_BRANCH setting for not forks
thomasrockhu-codecov Nov 15, 2024
7cb957d
fix: cleanup
thomasrockhu-codecov Nov 15, 2024
50e2f8a
fix: more cleanup
thomasrockhu-codecov Nov 15, 2024
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
21 changes: 20 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,32 @@ runs:
echo "CODECOV_TOKEN=$CODECOV_TOKEN" >> $GITHUB_ENV
fi
fi

- name: Override branch for forks
shell: bash
run: |
if [ -z "$CC_BRANCH" ] && [ -z "$CODECOV_TOKEN" ] && [ "${GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME}" != "$GITHUB_REPOSITORY" ];
then
echo -e "\033[0;32m==>\033[0m Fork detected, tokenless uploading used"
TOKENLESS="$GITHUB_EVENT_PULL_REQUEST_HEAD_LABEL"
CC_BRANCH="$GITHUB_EVENT_PULL_REQUEST_HEAD_LABEL"
echo "TOKENLESS=$TOKENLESS" >> $GITHUB_ENV
fi

echo "CC_BRANCH=$CC_BRANCH" >> $GITHUB_ENV
env:
CC_BRANCH: ${{ inputs.override_branch }}
GITHUB_EVENT_PULL_REQUEST_HEAD_LABEL: ${{ github.event.pull_request.head.label }}
GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME: ${{ github.event.pull_request.repo.full_name }}
Copy link

Choose a reason for hiding this comment

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

Greetings.

I am not sure where did full_name come from. This event variable does not exist in the documentation, and it is also not outputting anything when I am testing it in my repositories (not forks).

And due to that fact, the following check here:
if [ -z "$CC_BRANCH" ] && [ -z "$CODECOV_TOKEN" ] && [ "${GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME}" != "$GITHUB_REPOSITORY"
is always false when I am upgrading to codecov-action v5, which leads to some side effects with the token check.

So, unless I am missing something, I think it is a bug.

Best,
Rust

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@amureki there was a slight bug, but that has been fixed in 5.0.3. As for why is it empty, it seems that this variable when not from a fork will be empty, thus the issue you were seeing.

Copy link

Choose a reason for hiding this comment

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

Oh, got it @thomasrockhu-codecov
Thank you for the explanation and resolving the issue!

GITHUB_REPOSITORY: ${{ github.repository }}

- name: Upload coverage to Codecov
run: ${GITHUB_ACTION_PATH}/dist/codecov.sh
shell: bash
working-directory: ${{ inputs.working-directory }}
env:
CC_BINARY: ${{ inputs.binary }}
CC_BRANCH: ${{ inputs.override_branch }}
CC_BRANCH: $CC_BRANCH
CC_BUILD: ${{ inputs.override_build }}
CC_BUILD_URL: ${{ inputs.override_build_url }}
CC_CODE: ${{ inputs.report_code }}
Expand Down
Loading