Skip to content

Upload toolstates.json to rust-lang-ci2 #65274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 4 commits into from
Oct 31, 2019
Merged

Upload toolstates.json to rust-lang-ci2 #65274

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4479de4
ci: extract uploading artifacts into a script
emilyalbini Oct 10, 2019
0200050
ci: upload toolstates.json to rust-lang-ci2
emilyalbini Oct 10, 2019
bdfcde4
Apply suggestions from lzutao
emilyalbini Oct 29, 2019
ca34687
ci: move toolstates.json to /tmp/toolstate/ and docker mount it
emilyalbini Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions from lzutao 
Co-Authored-By: lzutao <taolzu@gmail.com>
  • Loading branch information
@emilyalbini @tesuji
emilyalbini and tesuji authored Oct 29, 2019
commit bdfcde439bcea75d74fe3b181d13332384daf130
6 changes: 3 additions & 3 deletions src/ci/scripts/upload-artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
upload_dir="$(mktemp -d)"

# Release tarballs produced by a dist builder.
if [[ "${DEPLOY-0}" = "1" ]] || [[ "${DEPLOY_ALT-0}" = "1" ]]; then
if [[ "${DEPLOY-0}" -eq "1" ]] || [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then
dist_dir=build/dist
if isLinux; then
dist_dir=obj/build/dist
Expand All @@ -24,7 +24,7 @@ fi
cp cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv"

# Toolstate data.
if [[ ! -z "${DEPLOY_TOOLSTATES_JSON+x}" ]]; then
if [[ -n "${DEPLOY_TOOLSTATES_JSON+x}" ]]; then
cp /tmp/toolstates.json "${upload_dir}/${DEPLOY_TOOLSTATES_JSON}"
fi

Expand All @@ -33,7 +33,7 @@ ls -lah "${upload_dir}"
echo

deploy_dir="rustc-builds"
if [[ "${DEPLOY_ALT-0}" = "1" ]]; then
if [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then
deploy_dir="rustc-builds-alt"
fi
deploy_url="s3://${DEPLOY_BUCKET}/${deploy_dir}/$(ciCommit)"
Expand Down