diff options
| author | bors <bors@rust-lang.org> | 2023-03-11 01:17:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-11 01:17:23 +0000 |
| commit | 6dfaa143662ddfd6ed2fecadef20eae0ec5d267d (patch) | |
| tree | f6dbc20d622daac9aa2bcfb7fa9b7a3f396fa40a /src/ci | |
| parent | ff4b772f805ec1e1c1bd7e189ab8d5a4e3a6ef13 (diff) | |
| parent | 9c24608b505cb106204183e8e12b66dad72f1450 (diff) | |
| download | rust-6dfaa143662ddfd6ed2fecadef20eae0ec5d267d.tar.gz rust-6dfaa143662ddfd6ed2fecadef20eae0ec5d267d.zip | |
Auto merge of #104527 - ferrocene:pa-more-licenses, r=pnkfelix
Add more license annotations This PR updates the `.reuse/dep5` file to include more accurate licensing data for everything in the repository (*excluding* submodules and dependencies). Some decisions were made in this PR: * The standard copyright attribution for files maintained by us is "The Rust Project Developers (see https://thanks.rust-lang.org)", to avoid having to maintain an in-tree `AUTHORS` file. * For files that have specific licensing terms, we added the terms to the `.reuse/dep5` rather than adding SPDX comments in the files themselves. * REUSE picks up any comment/text line with `Copyright` on it, so I had to sprinkle around `REUSE-IgnoreStart` and `REUSE-IgnoreEnd` comments. The rendered `COPYRIGHT` file is available at https://gist.github.com/pietroalbini/efb81103f69596d39758114f3f6a8688. r? `@pnkfelix`
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/scripts/collect-cpu-stats.sh | 3 | ||||
| -rwxr-xr-x | src/ci/scripts/upload-artifacts.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/scripts/collect-cpu-stats.sh b/src/ci/scripts/collect-cpu-stats.sh index 853b4628fab..44875b54ddc 100755 --- a/src/ci/scripts/collect-cpu-stats.sh +++ b/src/ci/scripts/collect-cpu-stats.sh @@ -6,4 +6,5 @@ set -euo pipefail IFS=$'\n\t' -python3 src/ci/cpu-usage-over-time.py &> cpu-usage.csv & +mkdir -p build +python3 src/ci/cpu-usage-over-time.py &> build/cpu-usage.csv & diff --git a/src/ci/scripts/upload-artifacts.sh b/src/ci/scripts/upload-artifacts.sh index ffa1859fc22..9755edb6dce 100755 --- a/src/ci/scripts/upload-artifacts.sh +++ b/src/ci/scripts/upload-artifacts.sh @@ -23,7 +23,7 @@ if [[ "${DEPLOY-0}" -eq "1" ]] || [[ "${DEPLOY_ALT-0}" -eq "1" ]]; then fi # CPU usage statistics. -cp cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv" +cp build/cpu-usage.csv "${upload_dir}/cpu-${CI_JOB_NAME}.csv" # Build metrics generated by x.py. cp "${build_dir}/metrics.json" "${upload_dir}/metrics-${CI_JOB_NAME}.json" |
