Skip to content
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

Jump to bottom

[CI] Use a lockfile for installing the datadog package #134095

Merged
merged 1 commit into from
Dec 17, 2024
Merged

[CI] Use a lockfile for installing the datadog package #134095

merged 1 commit into from
Dec 17, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Dec 9, 2024 •
edited
Loading

Without a lockfile, it could fail to compile when the dependencies have changed. Reported here.

r? @jdno

try-job: x86_64-msvc-ext2

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 9, 2024
@aDotInTheVoid
Copy link
Member

Once this lands, we should probably do something similar for browser-ui-test, which is currently also installed from NPM without a lockfile.

rust/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

Lines 105 to 106 in a224f38

ENV SCRIPT /tmp/checktools.sh ../x.py && \
npm install browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --unsafe-perm=true && \

@Kobzol
Copy link
Contributor Author

Kobzol commented Dec 11, 2024

r? @MarcoIeni

@rustbot rustbot assigned MarcoIeni and unassigned jdno Dec 11, 2024
@MarcoIeni
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 11, 2024

📌 Commit 3e3bcfa has been approved by MarcoIeni

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 11, 2024
@GuillaumeGomez
Rollup merge of rust-lang#134095 - Kobzol:datadog-lockfile, r=MarcoIeni
3849dc7 
[CI] Use a lockfile for installing the `datadog` package

Without a lockfile, it could fail to compile when the dependencies have changed. Reported [here](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20failure.20in.20DataDog.20upload).

r? `@jdno`
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 11, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2024
@bors
Auto merge of rust-lang#134184 - GuillaumeGomez:rollup-vne64k4, r=Gui…
11be577 
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#122003 (link libunwind dynamically and allow controlling it via `crt-static` on gnullvm targets)
 - rust-lang#133122 (Add unpolished, experimental support for AFIDT (async fn in dyn trait))
 - rust-lang#133859 (Move some alloc tests to the alloctests crate)
 - rust-lang#134095 ([CI] Use a lockfile for installing the `datadog` package)
 - rust-lang#134155 (Forbid `unsafe_op_in_unsafe_fn` for Hurd)
 - rust-lang#134173 (allow `symbol_intern_string_literal` lint in test modules)
 - rust-lang#134178 (Stabilize the Rust 2024 prelude)
 - rust-lang#134179 (Remove outdated consteval note from `<*mut T>::align_offset` docs.)

r? `@ghost`
`@rustbot` modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Dec 12, 2024
@jieyouxu
Rollup merge of rust-lang#134095 - Kobzol:datadog-lockfile, r=MarcoIeni
95125c1 
[CI] Use a lockfile for installing the `datadog` package

Without a lockfile, it could fail to compile when the dependencies have changed. Reported [here](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20failure.20in.20DataDog.20upload).

r? ``@jdno``
@jieyouxu jieyouxu mentioned this pull request Dec 12, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2024
@bors
Auto merge of rust-lang#134195 - jieyouxu:rollup-xnaenjd, r=jieyouxu
c06a6da 
Rollup of 13 pull requests

Successful merges:

 - rust-lang#122003 (link libunwind dynamically and allow controlling it via `crt-static` on gnullvm targets)
 - rust-lang#133122 (Add unpolished, experimental support for AFIDT (async fn in dyn trait))
 - rust-lang#133859 (Move some alloc tests to the alloctests crate)
 - rust-lang#134070 (Some asm! diagnostic adjustments and a papercut fix)
 - rust-lang#134095 ([CI] Use a lockfile for installing the `datadog` package)
 - rust-lang#134144 (Properly consider APITs for never type fallback ascription fix)
 - rust-lang#134152 (Simplify `rustc_mir_dataflow::abs_domain`.)
 - rust-lang#134154 (suppress field expr with generics error message if it's a method)
 - rust-lang#134155 (Forbid `unsafe_op_in_unsafe_fn` for Hurd)
 - rust-lang#134173 (allow `symbol_intern_string_literal` lint in test modules)
 - rust-lang#134178 (Stabilize the Rust 2024 prelude)
 - rust-lang#134179 (Remove outdated consteval note from `<*mut T>::align_offset` docs.)
 - rust-lang#134187 (Remove `PErr`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

@bors r- looks like its failing

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 12, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Dec 12, 2024 •
edited
Loading

Failed in rollup

2024-12-12T06:58:13.4430797Z found 0 vulnerabilities
2024-12-12T06:58:13.8673233Z Metric avg-cpu-usage: 79.5104
2024-12-12T06:58:13.8843957Z Traceback (most recent call last):
2024-12-12T06:58:13.8844644Z   File "D:\a\rust\rust\src\ci\scripts\upload-build-metrics.py", line 68, in <module>
2024-12-12T06:58:13.9588925Z     upload_datadog_measure("avg-cpu-usage", avg_cpu_usage)
2024-12-12T06:58:13.9590675Z   File "D:\a\rust\rust\src\ci\scripts\upload-build-metrics.py", line 51, in upload_datadog_measure
2024-12-12T06:58:13.9591291Z     subprocess.run(
2024-12-12T06:58:13.9591780Z   File "C:\hostedtoolcache\windows\Python\3.9.13\x64\lib\subprocess.py", line 505, in run
2024-12-12T06:58:14.0113610Z     with Popen(*popenargs, **kwargs) as process:
2024-12-12T06:58:14.0115247Z   File "C:\hostedtoolcache\windows\Python\3.9.13\x64\lib\subprocess.py", line 951, in __init__
2024-12-12T06:58:14.0122696Z     self._execute_child(args, executable, preexec_fn, close_fds,
2024-12-12T06:58:14.0123364Z   File "C:\hostedtoolcache\windows\Python\3.9.13\x64\lib\subprocess.py", line 1420, in _execute_child
2024-12-12T06:58:14.0337177Z     hp, ht, pid, tid = _winapi.CreateProcess(executable, args,
2024-12-12T06:58:14.0341267Z FileNotFoundError: [WinError 2] The system cannot find the file specified

@jieyouxu
Copy link
Member

@bors rollup=iffy

@Kobzol
Copy link
Contributor Author

Kobzol commented Dec 16, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134095 - Kobzol:datadog-lockfile, r=<try>
a523cf7 
[CI] Use a lockfile for installing the `datadog` package

Without a lockfile, it could fail to compile when the dependencies have changed. Reported [here](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20failure.20in.20DataDog.20upload).

r? `@jdno`

try-job: x86_64-msvc-ext2
@bors
Copy link
Contributor

bors commented Dec 16, 2024

⌛ Trying commit f9d25f9 with merge a523cf7...

@bors
Copy link
Contributor

bors commented Dec 16, 2024

💔 Test failed - checks-actions

@Kobzol
Copy link
Contributor Author

Kobzol commented Dec 16, 2024

@bors try

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Dec 16, 2024

⌛ Trying commit acef18d with merge 209bb50...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134095 - Kobzol:datadog-lockfile, r=<try>
209bb50 
[CI] Use a lockfile for installing the `datadog` package

Without a lockfile, it could fail to compile when the dependencies have changed. Reported [here](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20failure.20in.20DataDog.20upload).

r? `@jdno`

try-job: x86_64-msvc-ext2
@bors
Copy link
Contributor

bors commented Dec 16, 2024

☀️ Try build successful - checks-actions
Build commit: 209bb50 (209bb50784c2e55c0f113056d731d79898a40493)

@Kobzol
Copy link
Contributor Author

Kobzol commented Dec 16, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
@bors
Auto merge of rust-lang#134095 - Kobzol:datadog-lockfile, r=<try>
3797f99 
[CI] Use a lockfile for installing the `datadog` package

Without a lockfile, it could fail to compile when the dependencies have changed. Reported [here](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20failure.20in.20DataDog.20upload).

r? `@jdno`

try-job: x86_64-msvc-ext2
@bors
Copy link
Contributor

bors commented Dec 16, 2024

⌛ Trying commit 0db3a9a with merge 3797f99...

@bors
Copy link
Contributor

bors commented Dec 16, 2024

☀️ Try build successful - checks-actions
Build commit: 3797f99 (3797f99b226dd5217b0ebb5d88c1366e79fdfaf4)

@Kobzol
[CI] Use a lockfile for installing the datadog package
6e22b84 
Without a lockfile, it could fail to compile when the dependencies have changed.
@Kobzol
Copy link
Contributor Author

Kobzol commented Dec 16, 2024

More fun with MSYS2.. anyway, should be fixed now. I'll readd it to the queue if/when PR CI passes.

@Kobzol
Copy link
Contributor Author

Kobzol commented Dec 16, 2024 •
edited
Loading

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 16, 2024
@MarcoIeni
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 16, 2024

📌 Commit 6e22b84 has been approved by MarcoIeni

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2024
@jieyouxu
Copy link
Member

@bors p=10 (seems like other PRs like #134380 are still running into this, hoping that this will address the npm problems)

@bors
Copy link
Contributor

bors commented Dec 16, 2024

⌛ Testing commit 6e22b84 with merge 13b77c6...

@bors
Copy link
Contributor

bors commented Dec 17, 2024

☀️ Test successful - checks-actions
Approved by: MarcoIeni
Pushing 13b77c6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 17, 2024
@bors bors merged commit 13b77c6 into rust-lang:master Dec 17, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 17, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (13b77c6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 2.6%, secondary -0.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.6% [2.6%, 2.6%] 1
Regressions ❌
(secondary)		 1.9% [1.9%, 1.9%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) 2.6% [2.6%, 2.6%] 1

Cycles

Results (secondary 8.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 8.6% [6.8%, 10.2%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 771.96s -> 771.372s (-0.08%)
Artifact size: 332.99 MiB -> 333.00 MiB (0.00%)

@Kobzol Kobzol deleted the datadog-lockfile branch December 17, 2024 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@MarcoIeni MarcoIeni

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
10 participants
@Kobzol @aDotInTheVoid @MarcoIeni @bors @matthiaskrgr @jieyouxu @rust-log-analyzer @rust-timer @jdno @rustbot