Merge remote-tracking branch 'upstream/dev' into event-editor

melody-rs · Feb 7, 2024 · d272c86 · d272c86
2 parents 883747d + 58c5a2b
commit d272c86
Show file tree

Hide file tree

Showing 106 changed files with 7,266 additions and 3,001 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -102,12 +102,13 @@ jobs:
           targets: wasm32-unknown-unknown
           components: rust-src
       - name: Download and install Trunk binary
-        run: wget -qO- https://github.com/thedodd/trunk/releases/download/v0.17.5/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf-
+        run: wget -qO- https://github.com/trunk-rs/trunk/releases/download/v0.18.7/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C ${{ runner.temp }}
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
-      - run: ./trunk build --release
+      - name: Build luminol (Release)
+        run: ${{ runner.temp }}/trunk build --release
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: luminol-trunk
-          path: ${{ github.workspace }}/dist/
+          path: ${{ github.workspace }}/dist/