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

CI: Fixup failure to get changed files on merge #76296

Merged
merged 1 commit into from
Apr 20, 2023

Conversation

akien-mga
Copy link
Member

Follow-up to #76263.

The checkout might be too shallow so the before commit isn't available. The logic was already written to take this into account (it then generates an empty 'changed.txt' which falls back to testing everything), but the error code would still force terminate the job.

Hopefully we can find a way to make the logic work for merge events too in the future, but for now this is a quick fix.

The checkout might be too shallow so the before commit isn't available.
The logic was already written to take this into account (it then generates
an empty 'changed.txt' which falls back to testing everything), but the
error code would still force terminate the job.

Hopefully we can find a way to make the logic work for merge events too in
the future, but for now this is a quick fix.
@akien-mga akien-mga added bug topic:buildsystem cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:codestyle cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release cherrypick:4.0 labels Apr 20, 2023
@akien-mga akien-mga added this to the 4.1 milestone Apr 20, 2023
@akien-mga akien-mga requested a review from a team as a code owner April 20, 2023 15:52
Copy link
Contributor

@YuriSizov YuriSizov left a comment

Choose a reason for hiding this comment

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

I guess to properly test this fix we'd need to merge a bunch of PRs as a pack again.

@akien-mga akien-mga merged commit 6f1a52b into godotengine:master Apr 20, 2023
@akien-mga akien-mga deleted the ci-static-fixup-merge branch April 20, 2023 16:10
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.3.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Aug 28, 2023
@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Jan 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants