Skip to content

Test x.ps1 in msvc CI job - #112668

Merged
bors merged 1 commit into
rust-lang:masterfrom
Kobzol:ci-msvc-ps1
Jun 19, 2023
Merged

Test x.ps1 in msvc CI job#112668
bors merged 1 commit into
rust-lang:masterfrom
Kobzol:ci-msvc-ps1

Conversation

@Kobzol

@KobzolKobzol commented Jun 15, 2023

Copy link
Copy Markdown
Member

Small adjustment to #112633, to resolvethis comment.

r? @pietroalbini

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 15, 2023
@emilyalbini

emilyalbini commented Jun 15, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 334c14d has been approved by pietroalbini

It is now in the queue for this repository.

@borsbors 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 Jun 15, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 18, 2023
@compiler-errors
Rollup merge ofrust-lang#112668- Kobzol:ci-msvc-ps1, r=pietroalbini
f8a4a14
Test `x.ps1` in `msvc` CI job
Small adjustment to rust-lang#112633, to resolve [this comment](rust-lang#112633 (comment)).
r? `@pietroalbini`
@compiler-errorscompiler-errors mentioned this pull request Jun 18, 2023
Closed
@matthiaskrgr

matthiaskrgr commented Jun 18, 2023

Copy link
Copy Markdown
Member

@bors r-
#112754 (comment)

@borsbors 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 Jun 18, 2023
@rustbotrustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jun 18, 2023
@Kobzol

Kobzol commented Jun 18, 2023

Copy link
Copy Markdown
MemberAuthor

Maybe && doesn't work in the makefile? 🤔 Trying again with Makefile rule dependencies instead, let's see what CI says.

@rustbot author

@KobzolKobzol mentioned this pull request Jun 18, 2023
Merged
@Kobzol

Kobzol commented Jun 18, 2023

Copy link
Copy Markdown
MemberAuthor

Ok that should do it, now the tests pass.

@rustbot ready

@rustbotrustbot 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 Jun 18, 2023
@emilyalbini

emilyalbini commented Jun 18, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 18, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit d25e8d7 has been approved by pietroalbini

It is now in the queue for this repository.

@borsbors 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 Jun 18, 2023
@compiler-errorscompiler-errors mentioned this pull request Jun 18, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2023
@bors
Auto merge ofrust-lang#112774- compiler-errors:rollup-z8oof6r, r=co…
f217411
…mpiler-errors
Rollup of 6 pull requests
Successful merges:
- rust-lang#112537 (Don't record adjustments twice in `note_source_of_type_mismatch_constraint`)
- rust-lang#112663 (cleanup azure leftovers)
- rust-lang#112668 (Test `x.ps1` in `msvc` CI job)
- rust-lang#112710 (Re-use the deref-pattern recursion instead of duplicating the logic)
- rust-lang#112753 (Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts)
- rust-lang#112758 (refactor(resolve): delete update_resolution function)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit b099173 into rust-lang:masterJun 19, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 19, 2023
@Kobzol
Kobzol deleted the ci-msvc-ps1 branch June 19, 2023 05:58
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@emilyalbiniemilyalbini

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Kobzol@emilyalbini@bors@matthiaskrgr@rustbot