-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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 #89331 - GuillaumeGomez:rollup-b10unye, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #87260 (Libgccjit codegen) - #89212 (x.py: run `rustup toolchain link` in setup) - #89233 (Hide `<...> defined here` note if the source is not available) - #89235 (make junit output more consistent with default format) - #89255 (Fix incorrect disambiguation suggestion for associated items) - #89276 (Fix the population of the `union.impls` field) - #89283 (Add regression test for issue #83564) - #89318 (rustc_session: Remove lint store from `Session`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
96 changed files
with
13,403 additions
and
61 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
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 |
---|---|---|
@@ -0,0 +1,96 @@ | ||
name: CI | ||
|
||
on: | ||
- push | ||
- pull_request | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
|
||
strategy: | ||
fail-fast: false | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Install packages | ||
run: sudo apt-get install ninja-build ripgrep | ||
|
||
- name: Download artifact | ||
uses: dawidd6/action-download-artifact@v2 | ||
with: | ||
workflow: main.yml | ||
name: libgccjit.so | ||
path: gcc-build | ||
repo: antoyo/gcc | ||
|
||
- name: Setup path to libgccjit | ||
run: | | ||
echo $(readlink -f gcc-build) > gcc_path | ||
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0 | ||
- name: Set LIBRARY_PATH | ||
run: | | ||
echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV | ||
echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV | ||
# https://github.com/actions/cache/issues/133 | ||
- name: Fixup owner of ~/.cargo/ | ||
# Don't remove the trailing /. It is necessary to follow the symlink. | ||
run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/ | ||
|
||
- name: Cache cargo installed crates | ||
uses: actions/[email protected] | ||
with: | ||
path: ~/.cargo/bin | ||
key: cargo-installed-crates2-ubuntu-latest | ||
|
||
- name: Cache cargo registry | ||
uses: actions/cache@v1 | ||
with: | ||
path: ~/.cargo/registry | ||
key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }} | ||
|
||
- name: Cache cargo index | ||
uses: actions/cache@v1 | ||
with: | ||
path: ~/.cargo/git | ||
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} | ||
|
||
- name: Cache cargo target dir | ||
uses: actions/[email protected] | ||
with: | ||
path: target | ||
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }} | ||
|
||
- name: Build | ||
run: | | ||
./prepare_build.sh | ||
./build.sh | ||
cargo test | ||
./clean_all.sh | ||
- name: Prepare dependencies | ||
run: | | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "User" | ||
./prepare.sh | ||
# Compile is a separate step, as the actions-rs/cargo action supports error annotations | ||
- name: Compile | ||
uses: actions-rs/[email protected] | ||
with: | ||
command: build | ||
args: --release | ||
|
||
- 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 | ||
./test.sh --release |
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 |
---|---|---|
@@ -0,0 +1,20 @@ | ||
target | ||
**/*.rs.bk | ||
*.rlib | ||
*.o | ||
perf.data | ||
perf.data.old | ||
*.events | ||
*.string* | ||
/build_sysroot/sysroot | ||
/build_sysroot/sysroot_src | ||
/build_sysroot/Cargo.lock | ||
/build_sysroot/test_target/Cargo.lock | ||
/rust | ||
/simple-raytracer | ||
/regex | ||
gimple* | ||
*asm | ||
res | ||
test-backend | ||
gcc_path |
Oops, something went wrong.