diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-28 10:24:42 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-30 08:56:30 -0800 |
| commit | 45d203df302d1a4b684ffec07edc4ec7fd1fa36d (patch) | |
| tree | 88fa276a3471a20bd226e0ee0baf325c33426d2e | |
| parent | c81c1d6a41babf7e34120625727211cad7b40b87 (diff) | |
| download | rust-45d203df302d1a4b684ffec07edc4ec7fd1fa36d.tar.gz rust-45d203df302d1a4b684ffec07edc4ec7fd1fa36d.zip | |
travis: Tweak artifact uploads
* Don't upload `*.wixpdb` files by accident * Don't upload `doc` dir by accident * Fix level of indirection on Travis
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | src/bootstrap/dist.rs | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 8a7dc96b34b..5abbdbc599b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/appveyor.yml b/appveyor.yml index 418cdcb07af..c617ac8a4e3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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}/$_ diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 71a5f313bbd..5fac142f777 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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))); } } |