Skip to content

Commit c426cae

Browse files
committed
Use Cargo workspace and pass target specification to WiX
1 parent 730e0a0 commit c426cae

File tree

6 files changed

+49
-900
lines changed

6 files changed

+49
-900
lines changed

Cargo.lock

+33-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ kernel32-sys = "0.2.1"
6262
rustup-mock = { path = "src/rustup-mock", version = "0.5.0" }
6363
lazy_static = "0.1.15"
6464

65+
[workspace]
66+
members = ["src/ca-loader", "src/download", "src/rustup-dist", "src/rustup-mock", "src/rustup-utils", "src/rustup-win-installer"]
67+
6568
[lib]
6669
name = "rustup"
6770
path = "src/rustup/lib.rs"

appveyor.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ test_script:
5656
- ps: |
5757
if($env:BUILD_MSI) {
5858
cd src\rustup-win-installer
59-
cargo build --release
59+
cargo build --release --target %TARGET%
6060
cd msi
61-
.\build.ps1
61+
.\build.ps1 -Target %TARGET%
6262
cd ..\..\..
63+
if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
6364
}
6465
6566
notifications:

0 commit comments

Comments
 (0)