Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix msi build. Pin appveyor nightlies #910

Merged
merged 2 commits into from
Jan 24, 2017
Merged

Attempt to fix msi build. Pin appveyor nightlies #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f3d7b
Attempt to fix msi build. Pin appveyor nightlies
brson Jan 6, 2017
d6d3f88
Just disable the msi build
brson Jan 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
environment:
RUSTFLAGS: -Zunstable-options -Ctarget-feature=+crt-static
matrix:
- TARGET: i686-pc-windows-msvc
BUILD_MSI: 1
# FIXME
#- TARGET: i686-pc-windows-msvc
# BUILD_MSI: 1
- TARGET: i686-pc-windows-gnu
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci
MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
Expand All @@ -22,7 +23,7 @@ branches:
install:
# Install rust, x86_64-pc-windows-msvc host
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
- rustup-init.exe -y --default-toolchain=nightly-x86_64-pc-windows-msvc
- rustup-init.exe -y --default-toolchain=nightly-2017-01-06-x86_64-pc-windows-msvc
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin

# Install the target we're compiling for
Expand Down
4 changes: 2 additions & 2 deletions src/rustup-win-installer/msi/rustup.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- TODO: Change paths and names accordingly -->
<?define TargetPath="..\..\..\target\$(var.TARGET)\release"?>
<?define RustupCustomActionDll="$(var.TargetPath)\rustup_msi.dll"?>
<?define RustupCustomActionDll="$(var.TargetPath)\deps\rustup_msi.dll"?>
<?define RustupExe="$(var.TargetPath)\rustup-init.exe"?>

<Product Id="*" Name="rustup" Language="1033" Version="$(env.CFG_VER_MAJOR).$(env.CFG_VER_MINOR).$(env.CFG_VER_PATCH).0" Manufacturer="The Rust Project Developers" UpgradeCode="09acbb1c-7123-44ac-b2a9-4a04b28ced11">
Expand Down Expand Up @@ -83,4 +83,4 @@
environments so any new command prompts get the updated %PATH% -->
<CustomActionRef Id="WixBroadcastEnvironmentChange" />
</Product>
</Wix>
</Wix>