Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 7 pull requests #65990

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

Merged
merged 20 commits into from
Oct 31, 2019
Merged

Rollup of 7 pull requests #65990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fb4095d
Update comments re type parameter hack in object safety
mikeyhew Oct 26, 2019
4479de4
ci: extract uploading artifacts into a script
pietroalbini Oct 10, 2019
0200050
ci: upload toolstates.json to rust-lang-ci2
pietroalbini Oct 10, 2019
bdfcde4
Apply suggestions from lzutao
pietroalbini Oct 29, 2019
48d6510
ci: revert msys2 ca-certificates hack
pietroalbini Oct 30, 2019
1a8677a
Fix an incorrect docstring for Immediate in librustc_mir/interpret.
vext01 Oct 30, 2019
b22a163
Add long error explanation for E0577
GuillaumeGomez Oct 15, 2019
125d60d
Update ui tests
GuillaumeGomez Oct 15, 2019
ca34687
ci: move toolstates.json to /tmp/toolstate/ and docker mount it
pietroalbini Oct 30, 2019
308c4a6
Correctly indent get_predicates function
spastorino Oct 30, 2019
a6ac22e
Change CrateMetadata's source_map_import_info from RwLock to Once
spastorino Oct 30, 2019
4819cba
work around aggressive syntax feature gating
RalfJung Oct 30, 2019
12273cb
Make init_locking return a reference to the initialized data
spastorino Oct 30, 2019
6cee78c
Rollup merge of #65274 - pietroalbini:ci-upload-toolstate, r=alexcric…
Centril Oct 31, 2019
0bd4037
Rollup merge of #65434 - GuillaumeGomez:long-err-explanation-E0577, r…
Centril Oct 31, 2019
97b9d10
Rollup merge of #65850 - mikeyhew:patch-1, r=nikomatsakis
Centril Oct 31, 2019
ce64b17
Rollup merge of #65955 - pietroalbini:master-revert-msys2-hack, r=Mar…
Centril Oct 31, 2019
60fa6d8
Rollup merge of #65959 - vext01:immediate-docstring, r=davidtwco
Centril Oct 31, 2019
30ed544
Rollup merge of #65979 - spastorino:crate-metadata-mutexes, r=Mark-Si…
Centril Oct 31, 2019
83000c2
Rollup merge of #65981 - RalfJung:check-your-gates, r=Centril
Centril Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ci: revert msys2 ca-certificates hack 
The hack was added because upstream msys2 broke the ca-certificates
package, but since then it has been fixed. This reverts CI to use the
upstream package.
  • Loading branch information
@pietroalbini
pietroalbini committed Oct 30, 2019
commit 48d6510f6f0b44d4cdd3ebd0699d7ad703de6169
8 changes: 0 additions & 8 deletions src/ci/scripts/install-msys2-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
if isWindows; then
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar

# FIXME(#65767): workaround msys bug, step 2
arch=i686
if [ "$MSYS_BITS" = "64" ]; then
arch=x86_64
fi
pacman -U --noconfirm --noprogressbar mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
rm mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz

# Make sure we use the native python interpreter instead of some msys equivalent
# one way or another. The msys interpreters seem to have weird path conversions
# baked in which break LLVM's build system one way or another, so let's use the
Expand Down
8 changes: 0 additions & 8 deletions src/ci/scripts/install-msys2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash
# ignore-tidy-linelength
# Download and install MSYS2, needed primarily for the test suite (run-make) but
# also used by the MinGW toolchain for assembling things.
#
Expand All @@ -13,13 +12,6 @@ IFS=$'\n\t'
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"

if isWindows; then
# FIXME(#65767): workaround msys bug, step 1
arch=i686
if [ "$MSYS_BITS" = "64" ]; then
arch=x86_64
fi
curl -O "${MIRRORS_BASE}/msys2-repo/mingw/$arch/mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz"

choco install msys2 --params="/InstallDir:${SYSTEM_WORKFOLDER}/msys2 /NoPath" -y --no-progress
mkdir -p "${SYSTEM_WORKFOLDER}/msys2/home/${USERNAME}"

Expand Down