OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #39302 - alexcrichton:upload-all, r=brson 

travis: Upload all artifacts in build/dist

Previously we only uploaded tarballs, but this modifies Travis/AppVeyor to
upload everything. We shouldn't have anything else in there to worry about and
otherwise we need to be sure to pick up pkg/msi/exe installers.
This commit is contained in:
Alex Crichton 2017-01-27 14:41:13 -08:00
parent 0e64d4954f 8944582d1d
commit ac1e92328a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -110,9 +110,9 @@ before_deploy:
- mkdir -p deploy/$TRAVIS_COMMIT - mkdir -p deploy/$TRAVIS_COMMIT
- > - >
if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT; cp -r build/dist deploy/$TRAVIS_COMMIT;
else else
cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT; cp -r obj/build/dist deploy/$TRAVIS_COMMIT;
fi fi
deploy: deploy:

4
appveyor.yml
View File

@ -137,7 +137,7 @@ branches:
before_deploy: before_deploy:
- ps: | - ps: |
New-Item -Path deploy -ItemType directory New-Item -Path deploy -ItemType directory
Get-ChildItem -Path build\dist -Filter '*.tar.gz' | 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}/$_
} }
@ -151,7 +151,7 @@ deploy:
bucket: rust-lang-ci bucket: rust-lang-ci
set_public: true set_public: true
region: us-east-1 region: us-east-1
artifact: /.*\.tar.gz/ artifact: /.*/
folder: rustc-builds folder: rustc-builds
on: on:
branch: auto branch: auto