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.

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

chore: disregard branch in commit finder #586

Merged
merged 8 commits into from
Jan 8, 2024

Conversation

benmss
Copy link
Member

@benmss benmss commented Jan 3, 2024

As in some cases the branch for a commit found by the commit finder cannot also be found, and that branches are not needed to pull a commit, this PR removes all attempts at retrieving branch information as part of the commit finding process. This makes the commit finder return only a commit hash/digest.

Closes #585

Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jan 3, 2024
@benmss benmss changed the base branch from main to staging January 3, 2024 03:18
@benmss benmss self-assigned this Jan 3, 2024
@behnazh-w
Copy link
Member

behnazh-w commented Jan 3, 2024

We should be able to remove the branch and commit hash for the guava@32.1.2-jre testcase in integration_tests.sh:

$RUN_MACARON analyze -purl pkg:maven/com.google.guava/guava@32.1.2-jre?type=jar --skip-deps || log_fail

Can you please change the corresponding test?

Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
@benmss benmss changed the title 585 commit finder branch unavailable chore: 585 commit finder branch unavailable Jan 3, 2024
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
@benmss benmss force-pushed the 585-commit-finder-branch-unavailable branch from 4906bcd to 5cec585 Compare January 3, 2024 06:28
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
@nathanwn
Copy link
Member

nathanwn commented Jan 4, 2024

The PR title probably needs to be updated, with the issue number at the end and the description a bit more elaborate. Probably something like this, but just my suggestion:

chore: do not try to find a branch in commit finder (#585)

Otherwise, I think it's LGTM.

@benmss benmss changed the title chore: 585 commit finder branch unavailable chore: commit finder branch unavailable Jan 4, 2024
@benmss benmss changed the title chore: commit finder branch unavailable chore: disregard branch in commit finder branch Jan 4, 2024
@benmss benmss changed the title chore: disregard branch in commit finder branch chore: disregard branch in commit finder Jan 5, 2024
benmss added 4 commits January 5, 2024 14:09
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
@benmss benmss merged commit bd6bd98 into staging Jan 8, 2024
9 checks passed
art1f1c3R pushed a commit that referenced this pull request Nov 29, 2024
Signed-off-by: Ben Selwyn-Smith <benselwynsmith@googlemail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commit finder does not succeed when branch is unavailable
3 participants