Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 12:43:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
bevy/tools/example-showcase/asset-source-website.patch

14 lines
624 B
Diff
Raw Normal View History

examples showcase: use patches instead of sed for wasm hacks (#10601) # Objective - Fix the asset hack for wasm examples so that they work on the website - Use patches instead of sed for wasm hacks so that it fails explicitly when they need to be updated
2023-11-17 22:21:12 +00:00
diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
Fix `asset-source-website.patch` line number (#13286) # 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.
2024-05-12 20:49:43 +00:00
index ea8caf003..1b4b4bbf9 100644
examples showcase: use patches instead of sed for wasm hacks (#10601) # Objective - Fix the asset hack for wasm examples so that they work on the website - Use patches instead of sed for wasm hacks so that it fails explicitly when they need to be updated
2023-11-17 22:21:12 +00:00
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
Fix `asset-source-website.patch` line number (#13286) # 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.
2024-05-12 20:49:43 +00:00
@@ -134,7 +134,7 @@ impl Default for AssetPlugin {
examples showcase: use patches instead of sed for wasm hacks (#10601) # Objective - Fix the asset hack for wasm examples so that they work on the website - Use patches instead of sed for wasm hacks so that it fails explicitly when they need to be updated
2023-11-17 22:21:12 +00:00
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,
Fix `asset-source-website.patch` line number (#13286) # 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.
2024-05-12 20:49:43 +00:00
meta_check: AssetMetaCheck::default(),
Reference in a new issue Copy permalink