Skip to content

Conversation

clubby789
Copy link
Contributor

Revert #122489 and #122698

#122951 (comment)
The failures + rust-lang/rust-log-analyzer#81 are causing some annoying spam. I don't think this is that important for now and I don't know enough GHA to fix it 😓

@rustbot
Copy link
Collaborator

rustbot commented Mar 26, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 26, 2024
@Noratrieb
Copy link
Member

could you also take a look at #122951, which may or may not have caused more failures?

@Kobzol
Copy link
Member

Kobzol commented Mar 26, 2024

From the error:

    GITHUB_TOKEN: ***
failed to determine base repo: failed to run git: fatal: not a git repository (or any of the parent directories): .git

Error: Process completed with exit code 1.

It looks like the skip if S-waiting-on-bors step should have a checkout of the repository before it (not sure why it has worked before though).

@clubby789
Copy link
Contributor Author

That error is because I replaced 'exit' with 'gh run cancel' to prevent an failed run status. But that command only works inside a checkout which we're not in at this point. This revert fixes that

@Kobzol
Copy link
Member

Kobzol commented Mar 26, 2024

https://github.com/rust-lang/rust/actions/runs/8435672859/job/23101668190

It seems like there is another error that perhaps is related to the bump of the upload-artifact action though.

@clubby789 clubby789 force-pushed the un-often-cargo-update branch from 88df218 to c2de5af Compare March 26, 2024 15:36
@clubby789 clubby789 changed the title Revert cargo update changes Revert cargo update changes and bump download-artifact to v4 Mar 26, 2024
@clubby789
Copy link
Contributor Author

Added a bump to make download-artifact match, which should fix this?

@Kobzol
Copy link
Member

Kobzol commented Mar 26, 2024

Ok, let's try reverting for now, and updating the download action, to see if we can get back to a working state.

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned Mark-Simulacrum Mar 26, 2024
@Kobzol
Copy link
Member

Kobzol commented Mar 26, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 26, 2024

📌 Commit c2de5af has been approved by Kobzol

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 Mar 26, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#122766 (store segment and module in `UnresolvedImportError`)
 - rust-lang#122996 (simplify_branches: add comment)
 - rust-lang#123047 (triagebot: Add notification of 2024 issues)
 - rust-lang#123066 (CFI: (actually) check that methods are object-safe before projecting their receivers to `dyn Trait` in CFI)
 - rust-lang#123067 (match lowering: consistently merge simple or-patterns)
 - rust-lang#123069 (Revert `cargo update` changes and bump `download-artifact` to v4)
 - rust-lang#123070 (Add my former address to .mailmap)
 - rust-lang#123086 (Fix doc link to BufWriter in std::fs::File documentation)
 - rust-lang#123090 (Remove `CacheSelector` trait now that we can use GATs)
 - rust-lang#123091 (Delegation: fix ICE on wrong `self` resolution)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 17aabac into rust-lang:master Mar 26, 2024
@rustbot rustbot added this to the 1.79.0 milestone Mar 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2024
Rollup merge of rust-lang#123069 - clubby789:un-often-cargo-update, r=Kobzol

Revert `cargo update` changes and bump `download-artifact` to v4

Revert rust-lang#122489 and rust-lang#122698

rust-lang#122951 (comment)
The failures + rust-lang/rust-log-analyzer#81 are causing some annoying spam. I don't think this is _that_ important for now and I don't know enough GHA to fix it 😓
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants