From b6398794c9c34ee0590e25c4693b23758f0ff090 Mon Sep 17 00:00:00 2001 From: jugeeya Date: Thu, 16 Feb 2023 16:12:39 -0800 Subject: [PATCH] Don't upload static files or Skyline in beta release (#484) * Don't upload static files or Skyline in beta * Add Discord link --- .github/workflows/rust.yml | 51 +++++++++++++------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6dbf46b..a85e7de 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,14 +24,18 @@ jobs: - uses: Swatinem/rust-cache@v2 name: Rust Cache with: - prefix-key: "checker" - - name: Check - run: cargo +nightly check --target=x86_64-unknown-linux-gnu + prefix-key: "checker" - name: Clippy - run: cargo +nightly clippy --all-targets --all-features --target=x86_64-unknown-linux-gnu -- -D warnings + uses: actions-rs/cargo@v1 + continue-on-error: false + with: + command: clippy + args: --all-targets --all-features --target=x86_64-unknown-linux-gnu -- -D warnings - name: TUI Test - working-directory: training_mod_tui - run: cargo +nightly test + uses: actions-rs/cargo@v1 + continue-on-error: false + with: + working-directory: training_mod_tui plugin: name: Plugin NRO runs-on: ubuntu-latest @@ -53,11 +57,6 @@ jobs: with: name: plugin path: target/aarch64-skyline-switch/release/libtraining_modpack.nro - - name: Upload static files - uses: actions/upload-artifact@v2 - with: - name: static - path: src/static plugin_outside_training_mode: name: Plugin NRO (Outside Training Mode) if: github.ref == 'refs/heads/main' @@ -92,16 +91,9 @@ jobs: - name: Prepare zip id: prepare_zip env: - SKYLINE_DIR: atmosphere/contents/01006A800016E000 SMASH_PLUGIN_DIR: atmosphere/contents/01006A800016E000/romfs/skyline/plugins - SMASH_WEB_DIR: atmosphere/contents/01006A800016E000/manual_html/html-document/training_modpack.htdocs run: | - mkdir -p ${{env.SKYLINE_DIR}} mkdir -p ${{env.SMASH_PLUGIN_DIR}} - mkdir -p ${{env.SMASH_WEB_DIR}} - wget https://web.archive.org/web/20220210115256/https://github.com/skyline-dev/skyline/releases/download/beta/skyline.zip - unzip skyline.zip - mv exefs ${{env.SKYLINE_DIR}} cp plugin/libtraining_modpack.nro ${{env.SMASH_PLUGIN_DIR}}/libtraining_modpack.nro wget https://github.com/ultimate-research/params-hook-plugin/releases/download/v13.0.1/libparam_hook.nro wget https://github.com/ultimate-research/nro-hook-plugin/releases/download/v0.4.0/libnro_hook.nro @@ -109,7 +101,6 @@ 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 -r static/* ${{env.SMASH_WEB_DIR}} zip -r training_modpack_beta.zip atmosphere - name: Delete Release uses: dev-drprasad/delete-tag-and-release@v0.2.0 @@ -137,26 +128,18 @@ jobs: ## Installation + + *For fuller instructions, please join the [Discord](https://discord.gg/xUZWJ5BWe7) and visit the #setup-and-download channel.* - ### Installing on console - + - (*Console only*) Install Atmosphere to your hacked Switch. One great guide can be found at https://switch.homebrew.guide/ - Install the same way you would install a full release. + - Place the **contents** of the `training_modpack_beta.zip` on the root of your SD card. This means that you first unzip the file, then place its folder on the SD card root. The `atmosphere` folder should be **merged** onto the root of your SD card. - ### Installing on Ryujinx + - *For Ryujinx*: Paste the `contents` folder inside `atmosphere` into `%AppData%/Ryujinx/mods/` + - Download Skyline: https://github.com/skyline-dev/skyline/releases. Place the `exefs` folder from the zip into `atmosphere/contents/01006A800016E000` on your SD card. - - Instructions to get the beta working on Ryujinx. - - - 1. Download the latest build of Ryujinx, which can be found here: https://ryujinx.org/download/ - - 2. Download the beta. https://github.com/jugeeya/UltimateTrainingModpack/releases/tag/beta - - 3. The atmosphere folder from the beta zip is everything that should be in Ryujinx's mod folder. This means `%AppData%/Ryujinx/mods/contents/01006a800016e000` should have what `atmosphere/contents/01006a800016e000` has. - - 4. You should be good to go after this. When in training mode, use Special+Uptaunt to bring up the menu. + - *For Ryujinx*: Paste these files in `%AppData%/Ryujinx/mods/contents/01006a800016e000` files: > training_modpack_beta.zip - name: Upload zip as artifact