From a036590d49d82b319d9bd72bc8e6e105baafa67e Mon Sep 17 00:00:00 2001 From: Connor King Date: Thu, 19 Oct 2023 20:32:15 -0400 Subject: [PATCH 1/3] simplify generate_wasm_examples and add extra comments --- generate-wasm-examples/clone_bevy.sh | 6 ------ .../generate_wasm_examples.sh | 20 +++++++------------ 2 files changed, 7 insertions(+), 19 deletions(-) delete mode 100755 generate-wasm-examples/clone_bevy.sh diff --git a/generate-wasm-examples/clone_bevy.sh b/generate-wasm-examples/clone_bevy.sh deleted file mode 100755 index 2ffc3a1411..0000000000 --- a/generate-wasm-examples/clone_bevy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -git init bevy -cd bevy -git remote add origin https://github.com/bevyengine/bevy -git pull --depth=1 origin latest diff --git a/generate-wasm-examples/generate_wasm_examples.sh b/generate-wasm-examples/generate_wasm_examples.sh index f87f276da8..0526777e60 100755 --- a/generate-wasm-examples/generate_wasm_examples.sh +++ b/generate-wasm-examples/generate_wasm_examples.sh @@ -1,24 +1,18 @@ #!/bin/sh +set -x -./clone_bevy.sh - -# temporary: fetch tools from main branch -git init bevy-tools -cd bevy-tools -git remote add origin https://github.com/bevyengine/bevy -git pull --depth=1 origin main -cd .. -rm -rf bevy/tools -cp -r bevy-tools/tools bevy -rm -rf bevy-tools +# fetch bevy, just for bevyengine/tools +git clone https://github.com/bevyengine/bevy --depth 1 cd bevy +# build examples for webgl2 cargo run -p example-showcase -- build-website-list --content-folder content --api webgl2 +ls -R content mv content ../../content/examples -rm -rf content - +# build examples for webgpu cargo run -p example-showcase -- build-website-list --content-folder content --api webgpu +ls -R content mv content ../../content/examples-webgpu # remove markdown files from assets so that they don't get picked up by Zola From 3aa213d166b0984248ff434e268fafe24fc601c4 Mon Sep 17 00:00:00 2001 From: Connor King Date: Thu, 19 Oct 2023 23:17:05 -0400 Subject: [PATCH 2/3] remove `ls`s which i was testing with --- generate-wasm-examples/generate_wasm_examples.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/generate-wasm-examples/generate_wasm_examples.sh b/generate-wasm-examples/generate_wasm_examples.sh index 0526777e60..d5ca05c2e0 100755 --- a/generate-wasm-examples/generate_wasm_examples.sh +++ b/generate-wasm-examples/generate_wasm_examples.sh @@ -7,12 +7,10 @@ cd bevy # build examples for webgl2 cargo run -p example-showcase -- build-website-list --content-folder content --api webgl2 -ls -R content mv content ../../content/examples # build examples for webgpu cargo run -p example-showcase -- build-website-list --content-folder content --api webgpu -ls -R content mv content ../../content/examples-webgpu # remove markdown files from assets so that they don't get picked up by Zola From e79943ceed6c22c34cb92cdcda705b6122932b70 Mon Sep 17 00:00:00 2001 From: Connor King Date: Thu, 19 Oct 2023 23:20:33 -0400 Subject: [PATCH 3/3] remove a set -x i was also using for testing --- generate-wasm-examples/generate_wasm_examples.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate-wasm-examples/generate_wasm_examples.sh b/generate-wasm-examples/generate_wasm_examples.sh index d5ca05c2e0..f704c187e9 100755 --- a/generate-wasm-examples/generate_wasm_examples.sh +++ b/generate-wasm-examples/generate_wasm_examples.sh @@ -1,5 +1,4 @@ #!/bin/sh -set -x # fetch bevy, just for bevyengine/tools git clone https://github.com/bevyengine/bevy --depth 1