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

std: Update wasi-libc commit of the wasm32-wasi target #79578

Merged
merged 1 commit into from
Jan 20, 2021
Merged

std: Update wasi-libc commit of the wasm32-wasi target #79578

merged 1 commit into from
Jan 20, 2021

Conversation

alexcrichton
Copy link
Member

This brings in an implementation of current_dir and set_current_dir
(emulation in wasi-libc) as well as an updated version of finding
relative paths. This also additionally updates clang to the latest
release to build wasi-libc with.

@rust-highfive
Copy link
Collaborator

r? @shepmaster

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 2020
@alexcrichton
Copy link
Member Author

Before approving this, could I get infra team assistance to mirror https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz into the CI bucket?

@jyn514 jyn514 added T-libs Relevant to the library team, which will review and decide on the PR/issue. O-wasm Target: WASM (WebAssembly), http://webassembly.org/ labels Dec 1, 2020
@crlf0710 crlf0710 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 18, 2020
@alexcrichton
Copy link
Member Author

Oh dear looks like I forgot about this. @shepmaster are you up for reviewing this? If not do you know how I can request another reviewer?

@RReverser
Copy link
Contributor

RReverser commented Jan 8, 2021 •
edited
Loading

Ha, found this while checking if there are open PRs to integrate the current dir functionality. @alexcrichton glad you're on top of it :)

@KodrAus
Copy link
Contributor

KodrAus commented Jan 13, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jan 13, 2021

📌 Commit fc1ae1a has been approved by KodrAus

@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 Jan 13, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
@JohnTitor
Rollup merge of rust-lang#79578 - alexcrichton:update-waasi, r=KodrAus
1079d6a 
std: Update wasi-libc commit of the wasm32-wasi target

This brings in an implementation of `current_dir` and `set_current_dir`
(emulation in `wasi-libc`) as well as an updated version of finding
relative paths. This also additionally updates clang to the latest
release to build wasi-libc with.
@JohnTitor JohnTitor mentioned this pull request Jan 14, 2021
Closed
@JohnTitor
Copy link
Member

Failed in rollup:

Step 24/47 : RUN /tmp/build-wasi-toolchain.sh
 ---> Running in b479074d50ec
+ curl https://ci-mirrors.rust-lang.org/rustc/clang%2Bllvm-11.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   243    0   243    0     0    662      0 --:--:-- --:--:-- --:--:--   660
xz: (stdin): File format not recognized
tar: Child returned status 1
tar: Error is not recoverable: exiting now
The command '/bin/sh -c /tmp/build-wasi-toolchain.sh' returned a non-zero code: 2
##[error]Process completed with exit code 1.
Post job cleanup.

@bors r-

@bors bors 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 Jan 14, 2021
@KodrAus
Copy link
Contributor

KodrAus commented Jan 14, 2021

@bors rollup=iffy

@alexcrichton
Copy link
Member Author

@pietroalbini or @Mark-Simulacrum, would one of y'all be able to mirror the tarball above on s3?

@Mark-Simulacrum
Copy link
Member

hm, https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz appears to 404 for me - I used https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz as we've updated to 11.0.1 now I think and uploaded that to

https://ci-mirrors.rust-lang.org/rustc/2021-01-14-clang%2Bllvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz

(%2B appears to be important; regular + won't work)

@alexcrichton
Copy link
Member Author

@bors: r=KodrAus

Thanks @Mark-Simulacrum!

FWIW there's no need for a version match here, this is just the toolchain used to build wasi itself, which isn't cross-lang-LTO'd or anything like that.

@bors
Copy link
Contributor

bors commented Jan 14, 2021

📌 Commit 7eb0c7b7a144d449aeff271dd908e0263026e074 has been approved by KodrAus

@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: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2021
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
configure: rust.channel         := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
Checking which error codes lack tests...
Found 435 error codes
Found 0 error codes with no tests
Done!
tidy error: /checkout/src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh: ignoring line length unnecessarily
some tidy checks failed

command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build"
expected success, got: exit code: 1

@alexcrichton
std: Update wasi-libc commit of the wasm32-wasi target
5756bd7 
This brings in an implementation of `current_dir` and `set_current_dir`
(emulation in `wasi-libc`) as well as an updated version of finding
relative paths. This also additionally updates clang to the latest
release to build wasi-libc with.
@alexcrichton
Copy link
Member Author

@bors: r=KodrAus

@bors
Copy link
Contributor

bors commented Jan 14, 2021

📌 Commit 5756bd7 has been approved by KodrAus

@bors
Copy link
Contributor

bors commented Jan 14, 2021

⌛ Testing commit 5756bd7 with merge 7216bd0e3154fa9257c58622155c29d951e0b966...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
+ ./x.py --stage 2 test
      Boot ROM Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMfgI5Kaxbf9

hw.ncpu: 3
hw.byteorder: 1234
hw.memsize: 15032385536

@bors
Copy link
Contributor

bors commented Jan 15, 2021

💔 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 Jan 15, 2021
@alexcrichton
Copy link
Member Author

@bors: retry

@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 Jan 19, 2021
@bors
Copy link
Contributor

bors commented Jan 19, 2021

⌛ Testing commit 5756bd7 with merge 4d2eda19ac863963a6fb714196c031eb4a742b61...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-cargo failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Jan 19, 2021

💔 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 Jan 19, 2021
@alexcrichton
Copy link
Member Author

@bors: retry

@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 Jan 19, 2021
@bors
Copy link
Contributor

bors commented Jan 19, 2021

⌛ Testing commit 5756bd7 with merge 14265f9...

@bors
Copy link
Contributor

bors commented Jan 20, 2021

☀️ Test successful - checks-actions
Approved by: KodrAus
Pushing 14265f9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 20, 2021
@bors bors merged commit 14265f9 into rust-lang:master Jan 20, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 20, 2021
@PiotrSikora PiotrSikora mentioned this pull request Mar 4, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@shepmaster shepmaster

Labels
merged-by-bors This PR was explicitly merged by bors. O-wasm Target: WASM (WebAssembly), http://webassembly.org/ S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.