This CI will be the death of me

moonlight-mod · Oct 7, 2024 · 9a97fa0 · 9a97fa0
1 parent f8f101c
commit 9a97fa0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,18 +22,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
       - name: Install cargo-bundle
         run: cargo install cargo-bundle
 
-      - name: Build
-        run: cargo build --bin moonlight-installer --release
+      # cargo-bundle doesn't understand what to do about workspaces
       - name: Bundle
         run: |
+          cargo build --release
+          mv ./target ./crates/moonlight-installer
           cd ./crates/moonlight-installer
-          cargo bundle --bin moonlight-installer --release
+          cargo bundle --release
           cd ../..
-          cp -r ./crates/moonlight-installer/target/bundle/osx ./target/release/bundle
+          mv ./crates/moonlight-installer/target ./target
       - name: Apply ad-hoc signature
         run: codesign --force --deep -s - "target/release/bundle/osx/moonlight installer.app"
       - name: Create DMG

diff --git a/crates/moonlight-installer/Cargo.toml b/crates/moonlight-installer/Cargo.toml
@@ -20,7 +20,7 @@ libmoonlight = { path = "../libmoonlight" }
 [package.metadata.bundle]
 name = "moonlight installer"
 identifier = "io.github.moonlight-mod.moonlight-installer"
-icon = ["../assets/icon.png"]
+icon = ["../../assets/icon.png"]
 
 [target.'cfg(windows)'.build-dependencies]
 winresource = "0.1.17"