travis: Tweak artifact uploads

* Don't upload `*.wixpdb` files by accident
* Don't upload `doc` dir by accident
* Fix level of indirection on Travis
This commit is contained in:
Alex Crichton 2017-01-28 10:24:42 -08:00
parent c81c1d6a41
commit 45d203df30
3 changed files with 7 additions and 3 deletions

View File

@ -108,11 +108,12 @@ cache:
before_deploy:
- mkdir -p deploy/$TRAVIS_COMMIT
- rm -rf build/dist/doc
- >
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
cp -r build/dist deploy/$TRAVIS_COMMIT;
cp -r build/dist/* deploy/$TRAVIS_COMMIT;
else
cp -r obj/build/dist deploy/$TRAVIS_COMMIT;
cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
fi
deploy:

View File

@ -137,6 +137,7 @@ branches:
before_deploy:
- ps: |
New-Item -Path deploy -ItemType directory
Remove-Item -Recurse -Force build\dist\doc
Get-ChildItem -Path build\dist | Move-Item -Destination deploy
Get-ChildItem -Path deploy | Foreach-Object {
Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_

View File

@ -827,7 +827,7 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
cmd.arg("-nologo")
.arg("-ext").arg("WixUIExtension")
.arg("-ext").arg("WixUtilExtension")
.arg("-out").arg(distdir(build).join(filename))
.arg("-out").arg(exe.join(&filename))
.arg("rust.wixobj")
.arg("ui.wixobj")
.arg("rustwelcomedlg.wixobj")
@ -844,6 +844,8 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
cmd.arg("-sice:ICE57");
build.run(&mut cmd);
t!(fs::rename(exe.join(&filename), distdir(build).join(&filename)));
}
}