Use cargo-skyline docker image

.github/workflows/rust.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
-    - name: make
+    - name: Build overlay
       run: make
       working-directory: TrainingModpackOverlay
     - name: Upload overlay artifact
@@ -20,29 +20,36 @@ jobs:
       with:
         name: overlay
         path: TrainingModpackOverlay/ovlTrainingModpack.ovl
-  upload:
+  plugin:
     runs-on: ubuntu-latest
-    needs: overlay
+    container: jugeeya/cargo-skyline:latest
     steps:
     - uses: actions/checkout@v2
-    - name: Install cargo-skyline
+    - name: Build release NRO
-      run: cargo install --git https://github.com/jam1garner/cargo-skyline
+      run: cargo skyline build --release
-    - name: Install rust-std-skyline-squashed
+    - name: Upload plugin artifact
-      run: cd .. && git clone https://github.com/jam1garner/rust-std-skyline-squashed && cd -
+      uses: actions/upload-artifact@v1
-    - name: Install xargo
-      run: cargo install xargo
-    - name: Attempt to build
-      run: XARGO_RUST_SRC=$(realpath ../rust-std-skyline-squashed/src) PATH=$PATH:/usr/share/rust/.rustup/toolchains/nightly-2020-04-10-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin cargo skyline build --release
-    - uses: actions/download-artifact@v1
       with:
-        name: overlay
+        name: plugin
+        path: target/aarch64-skyline-switch/release/libtraining_modpack.nro
+  upload:
+    runs-on: ubuntu-latest
+    needs:
+      - overlay
+      - plugin
+    steps:
+    - name: Download all artifacts
+      uses: actions/download-artifact@v2
     - name: Prepare zip
+      env:
+        SMASH_PLUGIN_DIR: atmosphere/contents/01006A800016E000/romfs/skyline/plugins
+        TESLA_OVERLAY_DIR: switch/.overlays
       run: | 
-        mkdir -p atmosphere/contents/01006A800016E000/romfs/skyline/plugins/ 
+        mkdir -p ${{env.SMASH_PLUGIN_DIR}} 
-        cp ./target/aarch64-skyline-switch/release/libtraining_modpack.nro atmosphere/contents/01006A800016E000/romfs/skyline/plugins/libtraining_modpack.nro
+        cp plugin/libtraining_modpack.nro ${{env.SMASH_PLUGIN_DIR}}/libtraining_modpack.nro
-        mkdir -p switch/.overlays/
+        mkdir -p ${{env.TESLA_OVERLAY_DIR}}
-        cp overlay/ovlTrainingModpack.ovl switch/.overlays/ovlTrainingModpack.ovl
+        cp overlay/ovlTrainingModpack.ovl ${{env.TESLA_OVERLAY_DIR}}/ovlTrainingModpack.ovl
-        zip -r training_modpack_beta.zip atmosphere switch 
+        zip -r training_modpack_beta.zip atmosphere switch
     - name: Update Release
       uses: meeDamian/github-release@2.0
       with: