diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-19 15:49:46 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-20 08:35:49 -0800 |
| commit | a759406dce5e2b264d313be5fd559fffdb783d38 (patch) | |
| tree | 0fe4b58eb720b85af35582abe6a9ed2689ae5e31 | |
| parent | d5102e48f60b7a09d9bdc2297a4db36de45fc7f9 (diff) | |
| parent | c457b819d7ef4749bd20a1d6ada93d1fdc59bf59 (diff) | |
| download | rust-a759406dce5e2b264d313be5fd559fffdb783d38.tar.gz rust-a759406dce5e2b264d313be5fd559fffdb783d38.zip | |
Rollup merge of #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 #38531
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | appveyor.yml | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index c93079e3121..bcca0283f74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,11 +121,9 @@ before_deploy: - mkdir -p deploy/$TRAVIS_COMMIT - > if [ "$TRAVIS_OS_NAME" == "osx" ]; then - cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT && - find "deploy/$TRAVIS_COMMIT" -maxdepth 1 -type f -exec sh -c 'shasum -a 256 -b "{}" > "{}.sha256"' \;; + cp build/dist/*.tar.gz deploy/$TRAVIS_COMMIT; else - cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT && - find "deploy/$TRAVIS_COMMIT" -maxdepth 1 -type f -exec sh -c 'sha256sum -b "{}" > "{}.sha256"' \;; + cp obj/build/dist/*.tar.gz deploy/$TRAVIS_COMMIT; fi deploy: diff --git a/appveyor.yml b/appveyor.yml index 5fbeff0e51f..56ab8d98abd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -131,9 +131,6 @@ before_deploy: - ps: | New-Item -Path deploy -ItemType directory Get-ChildItem -Path build\dist -Filter '*.tar.gz' | Move-Item -Destination deploy - Get-FileHash .\deploy\* | ForEach-Object { - [io.file]::WriteAllText($_.Path + ".sha256", $_.Hash.ToLower() + "`n") - } Get-ChildItem -Path deploy | Foreach-Object { Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_ } @@ -147,7 +144,7 @@ deploy: bucket: rust-lang-ci set_public: true region: us-east-1 - artifact: /.*\.(tar.gz|sha256)/ + artifact: /.*\.tar.gz/ folder: rustc-builds on: branch: auto |