diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 8026e66..709b607 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -47,11 +47,6 @@ jobs: with: name: plugin path: target/aarch64-skyline-switch/release/libtraining_modpack.nro - - name: Upload menu plugin artifact - uses: actions/upload-artifact@v2 - with: - name: menu_plugin - path: libtraining_modpack_menu.nro - name: Upload static files uses: actions/upload-artifact@v2 with: @@ -101,9 +96,10 @@ jobs: cp libparam_hook.nro ${{env.SMASH_PLUGIN_DIR}}/libparam_hook.nro cp libnro_hook.nro ${{env.SMASH_PLUGIN_DIR}}/libnro_hook.nro cp libnn_hid_hook.nro ${{env.SMASH_PLUGIN_DIR}}/libnn_hid_hook.nro - cp menu_plugin/libtraining_modpack_menu.nro ${{env.SMASH_PLUGIN_DIR}}/libtraining_modpack_menu.nro + mv static/libtraining_modpack_menu.nro ${{env.SMASH_PLUGIN_DIR}}/libtraining_modpack_menu.nro + mv static/shader_binaries shader_binaries + mv static/font font.ttf cp -r static/* ${{env.SMASH_WEB_DIR}} - mv font font.ttf rm ${{env.SMASH_WEB_DIR}}/fonts -r zip -r training_modpack_beta.zip atmosphere shader_binaries font.ttf - name: Update Release diff --git a/font b/src/static/font similarity index 100% rename from font rename to src/static/font diff --git a/libtraining_modpack_menu.nro b/src/static/libtraining_modpack_menu.nro similarity index 100% rename from libtraining_modpack_menu.nro rename to src/static/libtraining_modpack_menu.nro diff --git a/shader_binaries/fragment/code.bin b/src/static/shader_binaries/fragment/code.bin similarity index 100% rename from shader_binaries/fragment/code.bin rename to src/static/shader_binaries/fragment/code.bin diff --git a/shader_binaries/fragment/control.bin b/src/static/shader_binaries/fragment/control.bin similarity index 100% rename from shader_binaries/fragment/control.bin rename to src/static/shader_binaries/fragment/control.bin diff --git a/shader_binaries/vertex/code.bin b/src/static/shader_binaries/vertex/code.bin similarity index 100% rename from shader_binaries/vertex/code.bin rename to src/static/shader_binaries/vertex/code.bin diff --git a/shader_binaries/vertex/control.bin b/src/static/shader_binaries/vertex/control.bin similarity index 100% rename from shader_binaries/vertex/control.bin rename to src/static/shader_binaries/vertex/control.bin