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

Fix asset-source-website.patch line number #13286

Merged
merged 2 commits into from May 12, 2024

Conversation

BD103
Copy link
Member

@BD103 BD103 commented May 9, 2024

Objective

Solution

  • Re-create the patch.
    • Due to new content being added, the line numbers were off.
  • Also, turns out that typos was checking patch files. This turned into a CI error, so I disabled that too. Patches shouldn't really be modified manually, the original source should be. (Also it was erroring on the commit hash.)

Testing

  • Test the new patch works by running git apply tools/example-showcase/asset-source-website.patch.
  • Verify the merge queue passes with the check-example-showcase-patches-still-work job succeeding.

@BD103 BD103 added C-Bug An unexpected or incorrect behavior D-Trivial Nice and easy! A great choice to get started with Bevy A-Build-System Related to build systems or continuous integration C-Regression Functionality that used to work but no longer does. Add a test for this! X-Uncontroversial This work is generally agreed upon labels May 9, 2024
@BD103
Copy link
Member Author

BD103 commented May 9, 2024

CI appeared to be failing because typos thought the commit number was a typo. I've excluded patch files from this check for the future.

@BD103
Copy link
Member Author

BD103 commented May 9, 2024

Marking this as trivial :)

@BD103 BD103 added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label May 9, 2024
@james7132 james7132 added this pull request to the merge queue May 12, 2024
Merged via the queue into bevyengine:main with commit 52d6147 May 12, 2024
28 checks passed
@BD103 BD103 deleted the fix-asset-patch branch May 12, 2024 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Build-System Related to build systems or continuous integration C-Bug An unexpected or incorrect behavior C-Regression Functionality that used to work but no longer does. Add a test for this! D-Trivial Nice and easy! A great choice to get started with Bevy S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it X-Uncontroversial This work is generally agreed upon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants