Skip to content

Commit a759406

Browse files
committed
Rollup merge of rust-lang#39167 - alexcrichton:no-more-sha, r=brson
travis: Stop uploading sha256 files We'll generate these later in the build process and otherwise they could just cause spurious failures with files overwriting one another. cc rust-lang#38531
2 parents d5102e4 + c457b81 commit a759406

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.travis.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ before_deploy:
121121
- mkdir -p deploy/$TRAVIS_COMMIT
122122
- >
123123
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
124-
cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT &&
125-
find "deploy/$TRAVIS_COMMIT" -maxdepth 1 -type f -exec sh -c 'shasum -a 256 -b "{}" > "{}.sha256"' \;;
124+
cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT;
126125
else
127-
cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT &&
128-
find "deploy/$TRAVIS_COMMIT" -maxdepth 1 -type f -exec sh -c 'sha256sum -b "{}" > "{}.sha256"' \;;
126+
cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT;
129127
fi
130128
131129
deploy:

appveyor.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@ before_deploy:
131131
- ps: |
132132
New-Item -Path deploy -ItemType directory
133133
Get-ChildItem -Path build\dist -Filter '*.tar.gz' | Move-Item -Destination deploy
134-
Get-FileHash .\deploy\* | ForEach-Object {
135-
[io.file]::WriteAllText($_.Path + ".sha256", $_.Hash.ToLower() + "`n")
136-
}
137134
Get-ChildItem -Path deploy | Foreach-Object {
138135
Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
139136
}
@@ -147,7 +144,7 @@ deploy:
147144
bucket: rust-lang-ci
148145
set_public: true
149146
region: us-east-1
150-
artifact: /.*\.(tar.gz|sha256)/
147+
artifact: /.*\.tar.gz/
151148
folder: rustc-builds
152149
on:
153150
branch: auto

0 commit comments

Comments
 (0)