Skip to content

Commit

Permalink
Fix asset-source-website.patch line number (#13286)
Browse files Browse the repository at this point in the history
# Objective

- Ever since #13177, the `check-example-showcase-patches-still-work` job
has been failing in the merge queue.
- Specifically, the `asset-source-website.patch` file which modifies
`bevy_asset`'s `lib.rs`.

## 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.
  • Loading branch information
BD103 committed May 12, 2024
1 parent 6f641e9 commit 52d6147
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/example-showcase/asset-source-website.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index 004f87a85..3c8656efc 100644
index ea8caf003..1b4b4bbf9 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -105,7 +105,7 @@ impl Default for AssetPlugin {
@@ -134,7 +134,7 @@ impl Default for AssetPlugin {
fn default() -> Self {
Self {
mode: AssetMode::Unprocessed,
- file_path: Self::DEFAULT_UNPROCESSED_FILE_PATH.to_string(),
+ file_path: "/assets/examples".to_string(),
processed_file_path: Self::DEFAULT_PROCESSED_FILE_PATH.to_string(),
watch_for_changes_override: None,
}
meta_check: AssetMetaCheck::default(),
1 change: 1 addition & 0 deletions typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
extend-exclude = [
"*.pbxproj", # metadata file
"CHANGELOG.md", # To keep consistency between the commit history/PRs.
"*.patch", # Automatically generated files that should not be manually modified.
]

# Corrections take the form of a key/value pair. The key is the incorrect word
Expand Down

0 comments on commit 52d6147

Please sign in to comment.