Skip to content

Commit ab29c70

Browse files
authored
Rollup merge of rust-lang#136977 - Kobzol:citool-datadog, r=marcoieni
Upload Datadog metrics with citool This removes one Python script and also the installation of the `datadog-ci` JavaScript package, along with the corresponding package and lock file. r? `@ghost`
2 parents f22b939 + 6c2c5dc commit ab29c70

File tree

10 files changed

+795
-5119
lines changed

10 files changed

+795
-5119
lines changed

.github/workflows/ci.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
5959
run: |
6060
cd src/ci/citool
61-
cargo test
62-
cargo run calculate-job-matrix >> $GITHUB_OUTPUT
61+
CARGO_INCREMENTAL=0 cargo test
62+
CARGO_INCREMENTAL=0 cargo run calculate-job-matrix >> $GITHUB_OUTPUT
6363
id: jobs
6464
job:
6565
name: ${{ matrix.full_name }}
@@ -183,11 +183,11 @@ jobs:
183183
run: src/ci/scripts/dump-environment.sh
184184

185185
# Pre-build citool before the following step uninstalls rustup
186-
# Build is into the build directory, to avoid modifying sources
186+
# Build it into the build directory, to avoid modifying sources
187187
- name: build citool
188188
run: |
189189
cd src/ci/citool
190-
CARGO_TARGET_DIR=../../../build/citool cargo build
190+
CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build
191191
192192
- name: run the build
193193
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
@@ -238,13 +238,9 @@ jobs:
238238
- name: upload job metrics to DataDog
239239
if: needs.calculate_matrix.outputs.run_type != 'pr'
240240
env:
241-
DATADOG_SITE: datadoghq.com
242241
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
243242
DD_GITHUB_JOB_NAME: ${{ matrix.full_name }}
244-
run: |
245-
cd src/ci
246-
npm ci
247-
python3 scripts/upload-build-metrics.py ../../build/cpu-usage.csv
243+
run: ./build/citool/debug/citool upload-build-metrics build/cpu-usage.csv
248244

249245
# This job isused to tell bors the final status of the build, as there is no practical way to detect
250246
# when a workflow is successful listening to webhooks only in our current bors implementation (homu).

0 commit comments

Comments
 (0)