diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2022-05-22 14:32:22 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2022-05-22 14:32:22 +0200 |
| commit | 836b2d2dbb0ad5ae4da2c6ae92d2de535ad77da3 (patch) | |
| tree | f87e003188ae48b7b0bf0660a366902f35411b20 /src/ci/scripts | |
| parent | 1c009e7e534d24efbf149e1c6eb2b9fde229c007 (diff) | |
| download | rust-836b2d2dbb0ad5ae4da2c6ae92d2de535ad77da3.tar.gz rust-836b2d2dbb0ad5ae4da2c6ae92d2de535ad77da3.zip | |
fix uploading build metrics on ci
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/upload-artifacts.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ci/scripts/upload-artifacts.sh b/src/ci/scripts/upload-artifacts.sh index 73e41f1f8d7..9d4a4682b33 100755 --- a/src/ci/scripts/upload-artifacts.sh +++ b/src/ci/scripts/upload-artifacts.sh @@ -10,12 +10,14 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" upload_dir="$(mktemp -d)" +build_dir=build +if isLinux; then + build_dir=obj/build +fi + # Release tarballs produced by a dist builder. if [[ "${DEPLOY-0}" -eq "1" ]] || [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then - dist_dir=build/dist - if isLinux; then - dist_dir=obj/build/dist - fi + dist_dir="${build_dir}/dist" rm -rf "${dist_dir}/doc" cp -r "${dist_dir}"/* "${upload_dir}" fi @@ -24,7 +26,7 @@ fi cp cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv" # Build metrics generated by x.py. -cp "${dist_dir}/../metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json" +cp "${build_dir}/metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json" # Toolstate data. if [[ -n "${DEPLOY_TOOLSTATES_JSON+x}" ]]; then |