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

Revert "chore: detect the channel a PR wants to merge into" #12204

Merged
merged 1 commit into from
May 31, 2023
Merged

Revert "chore: detect the channel a PR wants to merge into" #12204

merged 1 commit into from
May 31, 2023

Conversation

weihanglo
Copy link
Member

Reverts #12181

GitHub Action expression success() will look into the chain of dependent jobs. On master CI passed but on a backport it still failed #12200 (comment)

This isn't worth pursuing at this moment either. To fix it, it's unavoidable to write something like below for bors job

    if: "always() 
      && !(contains(needs.*.result, 'cancelled')
        || contains(needs.*.result, 'skipped')
        || contains(needs.*.result, 'failure')
      )
      && github.event_name == 'push'
      && github.ref == 'refs/heads/auto-cargo'
    "

I don't think that's good in long-term.

r? ehuss

@rustbot 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 May 30, 2023
@weihanglo weihanglo mentioned this pull request May 30, 2023
Closed
@epage
Copy link
Contributor

epage commented May 30, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented May 30, 2023

📌 Commit ffbf0ec has been approved by epage

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 May 30, 2023
@bors
Copy link
Collaborator

bors commented May 30, 2023

⌛ Testing commit ffbf0ec with merge 814aa46...

bors added a commit that referenced this pull request May 30, 2023
@bors
Auto merge of #12204 - rust-lang:revert-12181-which-channel-backport,…
814aa46 
… r=epage

Revert "chore: detect the channel a PR wants to merge into"

Reverts #12181

GitHub Action expression `success()` will look into the chain of dependent jobs. On master CI passed but on a backport it still failed <#12200 (comment)>

This isn't worth pursuing at this moment either. To fix it, it's unavoidable to write something like below for bors job

```yaml
    if: "always()
      && !(contains(needs.*.result, 'cancelled')
        || contains(needs.*.result, 'skipped')
        || contains(needs.*.result, 'failure')
      )
      && github.event_name == 'push'
      && github.ref == 'refs/heads/auto-cargo'
    "
```

I don't think that's good in long-term.

r? ehuss
@epage
Copy link
Contributor

epage commented May 30, 2023

@bors r-

@bors bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2023
@epage
Copy link
Contributor

epage commented May 30, 2023

Sorry, didn't see you were specifically looking for feedback from ehuss

@weihanglo
Copy link
Member Author

@epage I think it's fine with your approval, given the change is already broken. I should have just tagged ehuss instead of r?.

@bors
Copy link
Collaborator

bors commented May 30, 2023

☀️ Try build successful - checks-actions
Build commit: 814aa46 (814aa460fe360d1dc0d613351526709f9f9cdf2d)

@epage
Copy link
Contributor

epage commented May 30, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented May 30, 2023

📌 Commit ffbf0ec has been approved by epage

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-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels May 30, 2023
@bors
Copy link
Collaborator

bors commented May 30, 2023

⌛ Testing commit ffbf0ec with merge 3f09c0b...

bors added a commit that referenced this pull request May 30, 2023
@bors
Auto merge of #12204 - rust-lang:revert-12181-which-channel-backport,…
3f09c0b 
… r=epage

Revert "chore: detect the channel a PR wants to merge into"

Reverts #12181

GitHub Action expression `success()` will look into the chain of dependent jobs. On master CI passed but on a backport it still failed <#12200 (comment)>

This isn't worth pursuing at this moment either. To fix it, it's unavoidable to write something like below for bors job

```yaml
    if: "always()
      && !(contains(needs.*.result, 'cancelled')
        || contains(needs.*.result, 'skipped')
        || contains(needs.*.result, 'failure')
      )
      && github.event_name == 'push'
      && github.ref == 'refs/heads/auto-cargo'
    "
```

I don't think that's good in long-term.

r? ehuss
@bors
Copy link
Collaborator

bors commented May 30, 2023

💔 Test failed - checks-actions

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

@bors retry

GitHub response HTTP Code 429

@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 May 30, 2023
@bors
Copy link
Collaborator

bors commented May 31, 2023

⌛ Testing commit ffbf0ec with merge 99430e5...

@bors
Copy link
Collaborator

bors commented May 31, 2023

☀️ Test successful - checks-actions
Approved by: epage
Pushing 99430e5 to master...

@bors bors merged commit 99430e5 into master May 31, 2023
@bors bors deleted the revert-12181-which-channel-backport branch May 31, 2023 01:22
@ehuss
Copy link
Contributor

ehuss commented May 31, 2023

Hm, I'm sorry that didn't work out.

One thing I want to do is to consider using GitHub merge queues instead of bors. I wonder if that would make this easier?

I'll ping infra about the possibility of trying them out (I want to try them on some of my other repos first to see how they work). There is some backend work that needs to be done to support them, though.

@weihanglo weihanglo mentioned this pull request Jun 3, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2023
@bors
Auto merge of rust-lang#112259 - weihanglo:update-cargo, r=weihanglo
d8095ac 
Update cargo

14 commits in f7b95e31642e09c2b6eabb18ed75007dda6677a0..b0fa79679e717cd077b7fc0fa4166f47107f1ba9
2023-05-30 19:25:02 +0000 to 2023-06-03 14:19:48 +0000
- Emit error when users try to use a toolchain via the `add` or `install` command (rust-lang/cargo#12226)
- Support "default" option for `build.jobs` (rust-lang/cargo#12222)
- Fix typo in changelog (rust-lang/cargo#12227)
- chore: Sort `-Z` flags match statement (rust-lang/cargo#12223)
- Update curl-sys (rust-lang/cargo#12218)
- Bump to 0.73.0; update changelog (rust-lang/cargo#12219)
- refactor: housekeeping for 1.70.0 (rust-lang/cargo#12217)
- nit: fix typo in changelog for 1.70 (rust-lang/cargo#12215)
- Remove a noop `.clone` (rust-lang/cargo#12213)
- refactor: compiler invocations (rust-lang/cargo#12211)
- cargo clean: use `remove_dir_all` (rust-lang/cargo#11442)
- Add a small note about indexes ignoring SemVer build metadata. (rust-lang/cargo#12206)
- Revert "chore: detect the channel a PR wants to merge into" (rust-lang/cargo#12204)
- Don't distinguish `Debuginfo::None` and `Debuginfo::Explicit(None)` (rust-lang/cargo#12205)

r? `@ghost`
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Jun 11, 2023
@bors
Auto merge of #112259 - weihanglo:update-cargo, r=weihanglo
0b44f85 
Update cargo

14 commits in f7b95e31642e09c2b6eabb18ed75007dda6677a0..b0fa79679e717cd077b7fc0fa4166f47107f1ba9
2023-05-30 19:25:02 +0000 to 2023-06-03 14:19:48 +0000
- Emit error when users try to use a toolchain via the `add` or `install` command (rust-lang/cargo#12226)
- Support "default" option for `build.jobs` (rust-lang/cargo#12222)
- Fix typo in changelog (rust-lang/cargo#12227)
- chore: Sort `-Z` flags match statement (rust-lang/cargo#12223)
- Update curl-sys (rust-lang/cargo#12218)
- Bump to 0.73.0; update changelog (rust-lang/cargo#12219)
- refactor: housekeeping for 1.70.0 (rust-lang/cargo#12217)
- nit: fix typo in changelog for 1.70 (rust-lang/cargo#12215)
- Remove a noop `.clone` (rust-lang/cargo#12213)
- refactor: compiler invocations (rust-lang/cargo#12211)
- cargo clean: use `remove_dir_all` (rust-lang/cargo#11442)
- Add a small note about indexes ignoring SemVer build metadata. (rust-lang/cargo#12206)
- Revert "chore: detect the channel a PR wants to merge into" (rust-lang/cargo#12204)
- Don't distinguish `Debuginfo::None` and `Debuginfo::Explicit(None)` (rust-lang/cargo#12205)

r? `@ghost`
@ehuss ehuss added this to the 1.72.0 milestone Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
5 participants
@weihanglo @epage @bors @ehuss @rustbot