ci/contrib: use separate concurrency group #12835

dvdhrm · 2023-10-17T14:09:54Z

Run the contrib workflow in its own concurrency group to avoid multiple runs causing conflicting git pushes.

The contrib workflow pushes to the gh-pages branch, and thus is not safe to be run multiple times in parallel. Given that github-actions can stall workflow runs for quite some time, multiple executions can overtake each other. By using concurrency groups, all workflow runs will wait until previous runs completed.

Given that the workflow uses orphan-branches and forced pushes, conflicting workflows will not fail, but might produce outdated data if they overtake each other.

We explicitly disable cancellation to get better diagnostics and more easily find the first possible run that failed. Since these workflow runs are rather fast, and only run on master, cancellation seems not necessary.

Run the contrib workflow in its own concurrency group to avoid multiple runs causing conflicting git pushes. The contrib workflow pushes to the gh-pages branch, and thus is not safe to be run multiple times in parallel. Given that github-actions can stall workflow runs for quite some time, multiple executions can overtake each other. By using concurrency groups, all workflow runs will wait until previous runs completed. We explicitly disable cancellation to get better diagnostics and more easily find the first possible run that failed. Since these workflow runs are rather fast, and only run on master, cancellation seems not necessary.

rustbot · 2023-10-17T14:10:00Z

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

dvdhrm · 2023-10-17T14:11:23Z

@weihanglo was already reviewing my other change to the same workflow. Maybe it makes sense to assign this to them as well? (see #12834)

weihanglo · 2023-10-17T15:42:02Z

The best way to override assigned reviewers is using r?, i.e r? weihanglo

weihanglo

I can't recall there was any conflict happened on master, since bors is served as a merge queue manager for rust-lang/cargo and proect from that angle. Could you say more about what you've experienced makes you do this change?

BTW this looks safe to merge.

dvdhrm · 2023-10-17T17:17:25Z

I can't recall there was any conflict happened on master, since bors is served as a merge queue manager for rust-lang/cargo and protect from that angle. Could you say more about what you've experienced makes you do this change?

Yeah, this is again mostly about private forks. I sometimes push to master on private forks, which triggers this workflow (even in parallel, since there is no bors), and then I can share links to the generated docs of some proposed changes.

This is not crucial at all, but I thought kinda nice to have and untangles the workflow from bors.

dvdhrm · 2023-10-17T17:18:13Z

I mean, we could argue that there are better ways to render the docs and share them. But the workflow is already there and works, so I thought why not fix it. No strong opinions on my side, though.

weihanglo

Valid. Thanks!

weihanglo · 2023-10-17T19:03:16Z

@bors r+

bors · 2023-10-17T19:03:18Z

📌 Commit cdc7c1b has been approved by weihanglo

It is now in the queue for this repository.

bors · 2023-10-17T19:04:25Z

⌛ Testing commit cdc7c1b with merge f806be2...

bors · 2023-10-17T20:02:04Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing f806be2 to master...

weihanglo · 2023-10-18T14:41:24Z

~~It doesn't work https://doc.crates.io/contrib/. The tree has one more level of directory https://github.com/rust-lang/cargo/tree/gh-pages.~~

~~@dvdhrm could you help fix or revert it?~~

wrong thread.

Update cargo 22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2 2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000 - chore(deps): bump rustix from 0.38.18 to 0.38.19 (rust-lang/cargo#12851) - refactor: centralize logic of getting max resolve version (rust-lang/cargo#12860) - If there's a version in the lock file only use that exact version (rust-lang/cargo#12772) - Make the precise field of a source an Enum (rust-lang/cargo#12849) - fix(cli): Provide next steps for bad -Z flag (rust-lang/cargo#12857) - fix(remove): Preserve feature comments (rust-lang/cargo#12837) - docs: fix typo (rust-lang/cargo#12844) - chore(triagebot): auto label when PR review state changes (rust-lang/cargo#12856) - fix(add): Preserve more comments (rust-lang/cargo#12838) - ci: big ⚠️ to ensure the CNAME file is always there (rust-lang/cargo#12853) - docs(cargo-bench): `--bench` is passed in unconditionally to bench harnesses (rust-lang/cargo#12850) - docs(contrib): generate redirection HTML pages in CI (rust-lang/cargo#12846) - docs: remove review capacity notice (rust-lang/cargo#12842) - fix(help):Clarify install's positional (rust-lang/cargo#12841) - Adjust `-Zcheck-cfg` for new rustc syntax and behavior (rust-lang/cargo#12845) - fix(replace): Partial-version spec support (rust-lang/cargo#12806) - Print environment variables for build script executions with `-vv` (rust-lang/cargo#12829) - fix(cli): Suggest cargo-search on bad commands (rust-lang/cargo#12840) - docs(contrib): Policy on manifest editing (rust-lang/cargo#12836) - ci/contrib: use separate concurrency group (rust-lang/cargo#12835) - ci/contrib: do not fail on missing gh-pages (rust-lang/cargo#12834) - Clarify flag behavior in `cargo remove --help` (rust-lang/cargo#12823) r? ghost

rustbot assigned ehuss Oct 17, 2023

rustbot added A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2023

rustbot assigned weihanglo and unassigned ehuss Oct 17, 2023

weihanglo reviewed Oct 17, 2023

View reviewed changes

weihanglo approved these changes Oct 17, 2023

View reviewed changes

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 Oct 17, 2023

bors merged commit f806be2 into rust-lang:master Oct 17, 2023
20 checks passed

weihanglo mentioned this pull request Oct 20, 2023

Update cargo rust-lang/rust#117000

Merged

ehuss added this to the 1.75.0 milestone Nov 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ci/contrib: use separate concurrency group #12835

ci/contrib: use separate concurrency group #12835

dvdhrm commented Oct 17, 2023

rustbot commented Oct 17, 2023

dvdhrm commented Oct 17, 2023

weihanglo commented Oct 17, 2023

weihanglo left a comment

dvdhrm commented Oct 17, 2023

dvdhrm commented Oct 17, 2023

weihanglo left a comment

weihanglo commented Oct 17, 2023

bors commented Oct 17, 2023

bors commented Oct 17, 2023

bors commented Oct 17, 2023

weihanglo commented Oct 18, 2023 •

edited

Loading

ci/contrib: use separate concurrency group #12835

ci/contrib: use separate concurrency group #12835

Conversation

dvdhrm commented Oct 17, 2023

rustbot commented Oct 17, 2023

dvdhrm commented Oct 17, 2023

weihanglo commented Oct 17, 2023

weihanglo left a comment

Choose a reason for hiding this comment

dvdhrm commented Oct 17, 2023

dvdhrm commented Oct 17, 2023

weihanglo left a comment

Choose a reason for hiding this comment

weihanglo commented Oct 17, 2023

bors commented Oct 17, 2023

bors commented Oct 17, 2023

bors commented Oct 17, 2023

weihanglo commented Oct 18, 2023 • edited Loading

weihanglo commented Oct 18, 2023 •

edited

Loading