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.

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

Fix makefile style and fallback to general cc commands & temp windows builds fix #342

Merged
merged 4 commits into from Feb 5, 2023

Conversation

sagudev
Copy link
Member

@sagudev sagudev commented Feb 4, 2023

@jdm
Copy link
Member

jdm commented Feb 4, 2023

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit d23ff38 has been approved by jdm

@bors-servo
Copy link
Contributor

⌛ Testing commit d23ff38 with merge 405b1a4...

bors-servo added a commit that referenced this pull request Feb 4, 2023
Fix makefile style and fallback to general cc commands & temp windows builds fix

- use `cc` instead of `gcc` and `c++` instead of `g++` for fallback on linux
- format makefile
- pin window ci to rust 1.66 due to #334
- update nightly version used for UWP
@bors-servo
Copy link
Contributor

💔 Test failed - checks-github

@CYBAI
Copy link
Member

CYBAI commented Feb 5, 2023

@bors-servo retry

@bors-servo
Copy link
Contributor

⌛ Testing commit d23ff38 with merge f84c114...

@bors-servo
Copy link
Contributor

☀️ Test successful - checks-github
Approved by: jdm
Pushing f84c114 to master...

@bors-servo bors-servo merged commit f84c114 into servo:master Feb 5, 2023
@sagudev
Copy link
Member Author

sagudev commented Feb 5, 2023

Hm, something is still weird with UWP build.
there is rustup component add rust-src --toolchain nightly-2023-02-02-x86_64-pc-windows-msvc
so I do not know how can this error happened:

error: "C:\\Users\\runneradmin\\.rustup\\toolchains\\nightly-2023-02-02-x86_64-pc-windows-msvc\\lib\\rustlib\\src\\rust\\Cargo.lock" does not exist, unable to build with the standard library, try:
        rustup component add rust-src --toolchain nightly-2023-02-02-x86_64-pc-windows-msvc

and whats mor interesting is that again rustup default nightly-2023-02-02 does nothing as rustc --version --verbose still prints stable:

rustc 1.66.1 (90743e729 2023-01-10)
binary: rustc
commit-hash: 90743e7298aca107ddaa0c202a4d3604e29bfeb6
commit-date: 2023-01-10
host: x86_64-pc-windows-msvc
release: 1.66.1
LLVM version: 15.0.2

The reasons may be failing rustup updates. Anyway it looks like rustup bug to me.

@sagudev
Copy link
Member Author

sagudev commented Feb 5, 2023

I checked working builds and rustup default nightly-2023-02-02 still does nothing, but we get different errors when trying to update:

info: checking for self-updates
info: downloading self-update
error: could not remove 'setup' file: 'C:\Users\runneradmin\.cargo\bin/rustup-init.exe': Access is denied. (os error 5)
error: could not remove 'rustup-bin' file: 'C:\Users\runneradmin\.cargo\bin\rustup.exe': Access is denied. (os error 5)

while in failing build:

info: checking for self-updates
info: downloading self-update
error: could not remove 'setup' file: 'C:\Users\runneradmin\.cargo\bin/rustup-init.exe': Access is denied. (os error 5)
warning: tool `rustfmt` is already installed, remove it from `C:\Users\runneradmin\.cargo\bin`, then run `rustup update` to have rustup manage this tool.
warning: tool `cargo-fmt` is already installed, remove it from `C:\Users\runneradmin\.cargo\bin`, then run `rustup update` to have rustup manage this tool.

so either there are some differences in GH runners or race condition in rustup.

bors-servo added a commit that referenced this pull request Feb 19, 2023
use dtolnay/rust-toolchain for UWP toolchain

optimizes Windows workflows and hopefully bypasses `rustup` problems from #342.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants