52d6147e91
# 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.
14 lines
624 B
Diff
14 lines
624 B
Diff
diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
|
|
index ea8caf003..1b4b4bbf9 100644
|
|
--- a/crates/bevy_asset/src/lib.rs
|
|
+++ b/crates/bevy_asset/src/lib.rs
|
|
@@ -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(),
|