mirror of https://github.com/rust-lang/rust.git
Auto merge of #39368 - alexcrichton:fix-upload-dirs, r=aturon
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:
commit
8921707653
|
@ -108,11 +108,12 @@ cache:
|
||||||
|
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- mkdir -p deploy/$TRAVIS_COMMIT
|
- mkdir -p deploy/$TRAVIS_COMMIT
|
||||||
|
- rm -rf build/dist/doc
|
||||||
- >
|
- >
|
||||||
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||||
cp -r build/dist deploy/$TRAVIS_COMMIT;
|
cp -r build/dist/* deploy/$TRAVIS_COMMIT;
|
||||||
else
|
else
|
||||||
cp -r obj/build/dist deploy/$TRAVIS_COMMIT;
|
cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
|
|
|
@ -137,6 +137,7 @@ branches:
|
||||||
before_deploy:
|
before_deploy:
|
||||||
- ps: |
|
- ps: |
|
||||||
New-Item -Path deploy -ItemType directory
|
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 build\dist | Move-Item -Destination deploy
|
||||||
Get-ChildItem -Path deploy | Foreach-Object {
|
Get-ChildItem -Path deploy | Foreach-Object {
|
||||||
Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
|
Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
|
||||||
|
|
|
@ -827,7 +827,7 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
|
||||||
cmd.arg("-nologo")
|
cmd.arg("-nologo")
|
||||||
.arg("-ext").arg("WixUIExtension")
|
.arg("-ext").arg("WixUIExtension")
|
||||||
.arg("-ext").arg("WixUtilExtension")
|
.arg("-ext").arg("WixUtilExtension")
|
||||||
.arg("-out").arg(distdir(build).join(filename))
|
.arg("-out").arg(exe.join(&filename))
|
||||||
.arg("rust.wixobj")
|
.arg("rust.wixobj")
|
||||||
.arg("ui.wixobj")
|
.arg("ui.wixobj")
|
||||||
.arg("rustwelcomedlg.wixobj")
|
.arg("rustwelcomedlg.wixobj")
|
||||||
|
@ -844,6 +844,8 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
|
||||||
cmd.arg("-sice:ICE57");
|
cmd.arg("-sice:ICE57");
|
||||||
|
|
||||||
build.run(&mut cmd);
|
build.run(&mut cmd);
|
||||||
|
|
||||||
|
t!(fs::rename(exe.join(&filename), distdir(build).join(&filename)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue