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

Make CI more agnostic of the owning GitHub organization #127312

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Make CI more agnostic of the owning GitHub organization #127312

merged 1 commit into from
Jul 5, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jul 4, 2024

This should make it possible to switch running auto and try builds from rust-lang-ci to rust-lang.

r? @jdno

@Kobzol
Make CI more agnostic of the owning GitHub organization
410f760 
This should make it possible to switch running `auto` and `try` builds from `rust-lang-ci` to `rust-lang`.
@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 Jul 4, 2024
@jdno
Copy link
Member

jdno commented Jul 5, 2024

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit 410f760 has been approved by jdno

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 Jul 5, 2024
@bors
Copy link
Contributor

bors commented Jul 5, 2024

⌛ Testing commit 410f760 with merge 524d806...

@bors
Copy link
Contributor

bors commented Jul 5, 2024

☀️ Test successful - checks-actions
Approved by: jdno
Pushing 524d806 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2024
@bors bors merged commit 524d806 into rust-lang:master Jul 5, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 5, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (524d806): 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 -3.3%, secondary -1.1%)

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)		 1.8% [1.8%, 1.8%] 1
Improvements ✅
(primary)		 -3.3% [-3.3%, -3.3%] 1
Improvements ✅
(secondary)		 -1.6% [-2.5%, -0.8%] 5
All ❌✅ (primary) -3.3% [-3.3%, -3.3%] 1

Cycles

Results (secondary 0.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)		 0.6% [0.5%, 0.8%] 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: 700.69s -> 698.167s (-0.36%)
Artifact size: 328.26 MiB -> 328.26 MiB (-0.00%)

@Kobzol Kobzol deleted the ci-org-agnostic branch July 6, 2024 07:02
nikic
nikic reviewed Jul 10, 2024
View reviewed changes
src/ci/docker/run.sh
@@ -93,8 +93,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
docker --version

REGISTRY=ghcr.io
# PR CI runs on rust-lang, but we want to use the cache from rust-lang-ci
REGISTRY_USERNAME=rust-lang-ci
REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER}
Copy link
Contributor

@nikic nikic Jul 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that the docker cache is no longer used in local builds, because GITHUB_REPOSITORY_OWNER Is not set.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn, I forgot to fix this. I will send a PR later today, or tomorrow at the latest.

@Kobzol Kobzol mentioned this pull request Jul 10, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 10, 2024
@matthiaskrgr
Rollup merge of rust-lang#127569 - Kobzol:ci-fix-docker-local-rebuild…
3163919 
…, r=nikic

Fix local download of Docker caches from CI

rust-lang#127312 broke local downloads of Docker caches from CI, when you wanted to build a Docker image locally. This PR fixes that.

r? `@nikic`

(Can you please check if the cache works for you with this PR?)
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2024
@rust-timer
Unrolled build for rust-lang#127569
b768930 
Rollup merge of rust-lang#127569 - Kobzol:ci-fix-docker-local-rebuild, r=nikic

Fix local download of Docker caches from CI

rust-lang#127312 broke local downloads of Docker caches from CI, when you wanted to build a Docker image locally. This PR fixes that.

r? `@nikic`

(Can you please check if the cache works for you with this PR?)
@Kobzol Kobzol mentioned this pull request Dec 19, 2024
Open
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikic nikic nikic left review comments

Assignees

@jdno jdno

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.81.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Kobzol @jdno @bors @rust-timer @nikic @rustbot