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

Rollup of 7 pull requests #66739

Merged
merged 18 commits into from
Nov 25, 2019
Merged

Rollup of 7 pull requests #66739

merged 18 commits into from
Nov 25, 2019

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 18 commits October 19, 2019 19:21
@Mark-Simulacrum
Preserve whitespace inside one-backtick codeblocks
bc3ed32 
Previously this was only done inside short docblocks (e.g., summary
lines), but we should also do so in general.
@jsgf
Add unix::process::CommandExt::arg0
6dee1a5 
This allows argv[0] to be overridden on the executable's command-line. This also makes the program
executed independent of argv[0].

Does Fuchsia have the same semantics?

Addresses: rust-lang#66510
@pietroalbini
ci: add support for GitHub Actions in the CI scripts
262ce31
@pietroalbini
ci: guess some environment variables based on builder name and os
ee12992 
Some environment variables (like DEPLOY or DEPLOY_ALT for dist builders,
or IMAGE on Linux builders) are set on a lot of builders, and whether
they should be present or not can be detected automatically based on the
builder name and the platform.

This commit simplifies the CI configuration by automatically setting
those environment variables.
@pietroalbini
DO NOT MERGE: enable windows try builder
90a37bc
@GuillaumeGomez
Remove useless line for error index generation
347575a
@mark-i-m
drive-by cleanup in region naming
135c8b9
@RalfJung
panicking comments
35ee6bd
@RalfJung
expand type info on __rust_start_panic
80f5213
@RalfJung
make comment compile
6440b94
@petrochenkov
tidy: Remove unused import
2e41ce9
@pietroalbini
Rollup merge of rust-lang#65613 - Mark-Simulacrum:rustdoc-preserve-ws…
7520f6d 
…, r=GuillaumeGomez

Preserve whitespace inside one-backtick codeblocks

Previously this was only done inside short docblocks (e.g., summary
lines), but we should also do so in general.

Fixes rust-lang#65555
@pietroalbini
Rollup merge of rust-lang#66512 - jsgf:process-argv0, r=Dylan-DPC
2b4af10 
Add unix::process::CommandExt::arg0

This allows argv[0] to be overridden on the executable's command-line. This also makes the program
executed independent of argv[0].

Does Fuchsia have the same semantics? I'm assuming so.

Addresses: rust-lang#66510
@pietroalbini
Rollup merge of rust-lang#66569 - pietroalbini:gha-1, r=alexcrichton
c75044f 
GitHub Actions: preparations, part 1

This PR adds the first batch of commits in preparation for GitHub Actions:

* Added GitHub Actions support in `src/ci/shared.sh` and bootstrap.
* Addded a `setup-environment.sh` script which guesses and sets the `DEPLOY`, `DEPLOY_ALT` and `IMAGE` environment variables automatically, to reduce the verbosity of the CI configuration.

This PR does **not** yet add any builders on GitHub Actions.

r? @alexcrichton
@pietroalbini
Rollup merge of rust-lang#66678 - GuillaumeGomez:remove-useless-error…
b6dc227 
…-index-line, r=Dylan-DPC

Remove useless line for error index generation

As you can see here: https://github.com/rust-lang/rust/blob/master/src/librustc_error_codes/error_codes.rs#L10, this replacement is now completely useless.

r? @Dylan-DPC
@pietroalbini
Rollup merge of rust-lang#66684 - mark-i-m:error-reporting-cleanup, r…
11b8e16 
…=davidtwco

Drive-by cleanup in region naming
@pietroalbini
Rollup merge of rust-lang#66694 - RalfJung:panic-comments, r=Dylan-DPC
30599d7 
Add some comments to panic runtime
@pietroalbini
Rollup merge of rust-lang#66698 - petrochenkov:tidywarn, r=Mark-Simul…
43d7732 
…acrum

tidy: Remove unused import

It produces annoying warnings on `x.py` runs.
@pietroalbini
Copy link
Member Author

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Nov 25, 2019

📌 Commit 43d7732 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 25, 2019
@pietroalbini pietroalbini added the rollup A PR which is a rollup label Nov 25, 2019
@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit 43d7732 with merge 61a070b013c0982267542ba3a2867b30894fdfea...

@bors
Copy link
Contributor

bors commented Nov 25, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-11-25T16:20:24.4880850Z + /scripts/validate-toolstate.sh
2019-11-25T16:20:24.4929025Z Cloning into 'rust-toolstate'...
2019-11-25T16:20:25.1810062Z <Nothing changed>
2019-11-25T16:20:28.2377616Z Traceback (most recent call last):
2019-11-25T16:20:28.2377938Z   File "../../src/tools/publish_toolstate.py", line 267, in <module>
2019-11-25T16:20:28.2378253Z     validate_maintainers(repo, github_token)
2019-11-25T16:20:28.2378370Z   File "../../src/tools/publish_toolstate.py", line 75, in validate_maintainers
2019-11-25T16:20:28.2379138Z     assignable.extend(user['login'] for user in json.load(response))
2019-11-25T16:20:28.2379259Z   File "/usr/lib/python2.7/json/__init__.py", line 287, in load
2019-11-25T16:20:28.2379375Z     return loads(fp.read(),
2019-11-25T16:20:28.2379476Z   File "/usr/lib/python2.7/socket.py", line 355, in read
2019-11-25T16:20:28.2379554Z     data = self._sock.recv(rbufsize)
2019-11-25T16:20:28.2379653Z   File "/usr/lib/python2.7/httplib.py", line 622, in read
2019-11-25T16:20:28.2379747Z     s = self.fp.read(amt)
2019-11-25T16:20:28.2379823Z   File "/usr/lib/python2.7/socket.py", line 384, in read
2019-11-25T16:20:28.2380125Z     data = self._sock.recv(left)
2019-11-25T16:20:28.2380218Z   File "/usr/lib/python2.7/ssl.py", line 756, in recv
2019-11-25T16:20:28.2380314Z     return self.read(buflen)
2019-11-25T16:20:28.2380390Z   File "/usr/lib/python2.7/ssl.py", line 643, in read
2019-11-25T16:20:28.2380483Z     v = self._sslobj.read(len)
2019-11-25T16:20:28.2380599Z ssl.SSLError: [SSL: DECRYPTION_FAILED_OR_BAD_RECORD_MAC] decryption failed or bad record mac (_ssl.c:1758)
2019-11-25T16:20:28.2430280Z   local time: Mon Nov 25 16:20:28 UTC 2019
2019-11-25T16:20:28.5135812Z   network time: Mon, 25 Nov 2019 16:20:28 GMT
2019-11-25T16:20:28.5137163Z == end clock drift check ==
2019-11-25T16:20:30.6456890Z 
2019-11-25T16:20:30.6456890Z 
2019-11-25T16:20:30.6513574Z ##[error]Bash exited with code '1'.
2019-11-25T16:20:30.6543369Z ##[section]Starting: Checkout
2019-11-25T16:20:30.6545653Z ==============================================================================
2019-11-25T16:20:30.6545737Z Task         : Get sources
2019-11-25T16:20:30.6545835Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@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 Nov 25, 2019
@pietroalbini
Copy link
Member Author

Wtf.

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 25, 2019
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 25, 2019
@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit 43d7732 with merge a44774c...

bors added a commit that referenced this pull request Nov 25, 2019
@bors
Auto merge of #66739