forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#86966 - JohnTitor:rollup-uiqj2vc, r=JohnTitor
Rollup of 9 pull requests Successful merges: - rust-lang#86639 (Support lint tool names in rustc command line options) - rust-lang#86812 (Recover from `&dyn mut ...` parse errors) - rust-lang#86917 (Add doc comment for `impl From<LayoutError> for TryReserveError`) - rust-lang#86925 (Add self to mailmap) - rust-lang#86927 (Sync rustc_codegen_cranelift) - rust-lang#86932 (Fix ICE when misplaced visibility cannot be properly parsed) - rust-lang#86933 (Clean up rustdoc static files) - rust-lang#86955 (Fix typo in `ops::Drop` docs) - rust-lang#86956 (Revert "Add "every" as a doc alias for "all".") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
120 changed files
with
1,521 additions
and
531 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,6 +114,7 @@ Heather <[email protected]> <[email protected]> | |
| Heather <[email protected]> <[email protected]> | ||
| Herman J. Radtke III <[email protected]> Herman J. Radtke III <[email protected]> | ||
| Ilyong Cho <[email protected]> | ||
| inquisitivecrystal <[email protected]> | ||
| Ivan Ivaschenko <[email protected]> | ||
| J. J. Weber <[email protected]> | ||
| Jakub Adam Wieczorek <[email protected]> <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ task: | |
| - . $HOME/.cargo/env | ||
| - git config --global user.email "[email protected]" | ||
| - git config --global user.name "User" | ||
| - ./prepare.sh | ||
| - ./y.rs prepare | ||
| test_script: | ||
| - . $HOME/.cargo/env | ||
| - # Enable backtraces for easier debugging | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,9 @@ jobs: | |
| - os: ubuntu-latest | ||
| env: | ||
| TARGET_TRIPLE: x86_64-pc-windows-gnu | ||
| - os: ubuntu-latest | ||
| env: | ||
| TARGET_TRIPLE: aarch64-unknown-linux-gnu | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
@@ -49,11 +52,19 @@ jobs: | |
| sudo apt-get install -y gcc-mingw-w64-x86-64 wine-stable | ||
| rustup target add x86_64-pc-windows-gnu | ||
| - name: Install AArch64 toolchain and qemu | ||
| if: matrix.os == 'ubuntu-latest' && matrix.env.TARGET_TRIPLE == 'aarch64-unknown-linux-gnu' | ||
| run: | | ||
| sudo apt-get install -y gcc-aarch64-linux-gnu qemu-user | ||
| - name: Prepare dependencies | ||
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "User" | ||
| ./prepare.sh | ||
| ./y.rs prepare | ||
| - name: Build | ||
| run: ./y.rs build --sysroot none | ||
|
|
||
| - name: Test | ||
| env: | ||
|
|
@@ -87,3 +98,63 @@ jobs: | |
| with: | ||
| name: cg_clif-${{ runner.os }}-cross-x86_64-mingw | ||
| path: cg_clif.tar.xz | ||
|
|
||
| build_windows: | ||
| runs-on: windows-latest | ||
| timeout-minutes: 60 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| #- name: Cache cargo installed crates | ||
| # uses: actions/cache@v2 | ||
| # with: | ||
| # path: ~/.cargo/bin | ||
| # key: ${{ runner.os }}-cargo-installed-crates | ||
|
|
||
| #- name: Cache cargo registry and index | ||
| # uses: actions/cache@v2 | ||
| # with: | ||
| # path: | | ||
| # ~/.cargo/registry | ||
| # ~/.cargo/git | ||
| # key: ${{ runner.os }}-cargo-registry-and-index-${{ hashFiles('**/Cargo.lock') }} | ||
|
|
||
| #- name: Cache cargo target dir | ||
| # uses: actions/cache@v2 | ||
| # with: | ||
| # path: target | ||
| # key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain', '**/Cargo.lock') }} | ||
|
|
||
| - name: Prepare dependencies | ||
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "User" | ||
| git config --global core.autocrlf false | ||
| rustup set default-host x86_64-pc-windows-gnu | ||
| rustc y.rs -o y.exe -g | ||
| ./y.exe prepare | ||
| - name: Build | ||
| #name: Test | ||
| run: | | ||
| # Enable backtraces for easier debugging | ||
| #export RUST_BACKTRACE=1 | ||
| # Reduce amount of benchmark runs as they are slow | ||
| #export COMPILE_RUNS=2 | ||
| #export RUN_RUNS=2 | ||
| # Enable extra checks | ||
| #export CG_CLIF_ENABLE_VERIFIER=1 | ||
| ./y.exe build | ||
| #- name: Package prebuilt cg_clif | ||
| # run: tar cvfJ cg_clif.tar.xz build | ||
|
|
||
| #- name: Upload prebuilt cg_clif | ||
| # uses: actions/upload-artifact@v2 | ||
| # with: | ||
| # name: cg_clif-${{ runner.os }} | ||
| # path: cg_clif.tar.xz | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ jobs: | |
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "User" | ||
| ./prepare.sh | ||
| ./y.rs prepare | ||
| - name: Test | ||
| run: | | ||
|
|
@@ -72,7 +72,7 @@ jobs: | |
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "User" | ||
| ./prepare.sh | ||
| ./y.rs prepare | ||
| - name: Test | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.