Skip to content

Commit ac1e923

Browse files
committed
Rollup merge of rust-lang#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.
2 parents 0e64d49 + 8944582 commit ac1e923

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ before_deploy:
110110
- mkdir -p deploy/$TRAVIS_COMMIT
111111
- >
112112
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
113-
cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT;
113+
cp -r build/dist deploy/$TRAVIS_COMMIT;
114114
else
115-
cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT;
115+
cp -r obj/build/dist deploy/$TRAVIS_COMMIT;
116116
fi
117117
118118
deploy:

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ branches:
137137
before_deploy:
138138
- ps: |
139139
New-Item -Path deploy -ItemType directory
140-
Get-ChildItem -Path build\dist -Filter '*.tar.gz' | Move-Item -Destination deploy
140+
Get-ChildItem -Path build\dist | Move-Item -Destination deploy
141141
Get-ChildItem -Path deploy | Foreach-Object {
142142
Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
143143
}
@@ -151,7 +151,7 @@ deploy:
151151
bucket: rust-lang-ci
152152
set_public: true
153153
region: us-east-1
154-
artifact: /.*\.tar.gz/
154+
artifact: /.*/
155155
folder: rustc-builds
156156
on:
157157
branch: auto

0 commit comments

Comments
 (0)