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

Jump to bottom

Fix workflow failure when (Has Conflicts) label is already removed #17558

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Fix workflow failure when (Has Conflicts) label is already removed #17558

merged 1 commit into from
Dec 5, 2024

Conversation

lukstbit
Copy link
Member

@lukstbit lukstbit commented Dec 5, 2024 •
edited
Loading

Purpose / Description

Looked at other workflows where we catch api calls errors and added a try-catch for 404 failures while still failing for any other errors.

Fixes

How Has This Been Tested?

Not really testable.

Checklist

  • You have a descriptive commit message with a short title (first line, max 50 chars).
  • You have commented your code, particularly in hard-to-understand areas
  • You have performed a self-review of your own code
  • UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
  • UI Changes: You have tested your change using the Google Accessibility Scanner

mikehardy
mikehardy approved these changes Dec 5, 2024
View reviewed changes
Copy link
Member

@mikehardy mikehardy left a comment

Choose a reason for hiding this comment

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

seems like it will work, yes testing hard in this case
one tiny nitpick but in the main a +1, thanks!

.github/workflows/conflict.yaml Outdated Show resolved Hide resolved
david-allison
david-allison approved these changes Dec 5, 2024
View reviewed changes
Copy link
Member

@david-allison david-allison left a comment

Choose a reason for hiding this comment

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

I'm happy, nitpick only

.github/workflows/conflict.yaml Show resolved Hide resolved
@lukstbit
Fix workflow failure when (Has Conflicts) label is already removed
e5936d2 
Wrap the offending API call in a try-catch and look for 404 errors.
@lukstbit lukstbit force-pushed the fix_conflictsWorkflowMissingLabel branch from 65594cb to e5936d2 Compare December 5, 2024 17:00
@lukstbit lukstbit added Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) and removed Priority-Low Needs Review labels Dec 5, 2024
@lukstbit lukstbit enabled auto-merge December 5, 2024 17:05
@lukstbit lukstbit added this pull request to the merge queue Dec 5, 2024
Merged via the queue into ankidroid:main with commit 7be22ea Dec 5, 2024
9 checks passed
@github-actions github-actions bot removed the Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) label Dec 5, 2024
@github-actions github-actions bot added this to the 2.21 release milestone Dec 5, 2024
@lukstbit lukstbit deleted the fix_conflictsWorkflowMissingLabel branch December 5, 2024 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@david-allison david-allison david-allison approved these changes

@mikehardy mikehardy mikehardy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.21 release
Development

Successfully merging this pull request may close these issues.

Conflict Scan: fails if label is already removed
3 participants
@lukstbit @mikehardy @david-allison