Skip to content

Commit

Permalink
Attempt to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
antoyo committed Aug 19, 2023
1 parent c8d7c04 commit 4dce16a
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ jobs:
echo $(readlink -f gcc-build) > gcc_path
# NOTE: the filename is still libgccjit.so even when the artifact name is different.
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/11
cp gcc-build/*lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/11/
- name: Set env
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
echo $(readlink -f gcc-build) > gcc_path
# NOTE: the filename is still libgccjit.so even when the artifact name is different.
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/11
cp gcc-build/*lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/11/
- name: Set env
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/stdarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ jobs:
echo $(readlink -f gcc-build) > gcc_path
# NOTE: the filename is still libgccjit.so even when the artifact name is different.
ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
mkdir -p /opt/gcc/libexec/gcc/x86_64-linux-gnu/11
cp gcc-build/*lto* /opt/gcc/libexec/gcc/x86_64-linux-gnu/11/
- name: Set env
run: |
Expand Down
3 changes: 2 additions & 1 deletion build_sysroot/build_sysroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ rm -r sysroot/ 2>/dev/null || true
export RUSTFLAGS="$RUSTFLAGS -Z force-unstable-if-unmarked"
if [[ "$1" == "--release" ]]; then
sysroot_channel='release'
LIBRARY_PATH=/home/bouanto/Ordinateur/Programmation/Projets/gcc-repo/gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
# FIXME: make LIBRARY_PATH something approciate in the CI.
LIBRARY_PATH=gcc-build GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
#CG_GCCJIT_DUMP_TREE_ALL=1 CG_GCCJIT_KEEP_INTERMEDIATES=1 RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
else
sysroot_channel='debug'
Expand Down
3 changes: 2 additions & 1 deletion cargo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ cmd=$1
shift

# TODO: remove LIBRARY_PATH and GCC_EXEC_PREFIX. Those are used to debug the LTO front-end.
LIBRARY_PATH=/home/bouanto/Ordinateur/Programmation/Projets/gcc-repo/gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu PATH=$PATH:/opt/gcc/bin RUSTDOCFLAGS="$RUSTFLAGS" cargo +${TOOLCHAIN} $cmd $@
#LIBRARY_PATH=/home/bouanto/Ordinateur/Programmation/Projets/gcc-repo/gcc-build/build/gcc GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu
PATH=$PATH:/opt/gcc/bin RUSTDOCFLAGS="$RUSTFLAGS" cargo +${TOOLCHAIN} $cmd $@
8 changes: 8 additions & 0 deletions failing-ui-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,11 @@ tests/ui/panics/nested_panic_caught.rs
tests/ui/simd/intrinsic/generic-bswap-byte.rs
tests/ui/const_prop/ice-issue-111353.rs
tests/ui/process/println-with-broken-pipe.rs
tests/ui/panic-runtime/lto-abort.rs
tests/ui/lto/thin-lto-inlines2.rs
tests/ui/lto/weak-works.rs
tests/ui/lto/thin-lto-inlines.rs
tests/ui/lto/thin-lto-global-allocator.rs
tests/ui/lto/msvc-imp-present.rs
tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
tests/ui/lto/all-crates.rs
3 changes: 2 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function clean() {

function mini_tests() {
echo "[BUILD] mini_core"
$RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib,dylib --target $TARGET_TRIPLE
GCC_EXEC_PREFIX=/opt/gcc/libexec/gcc/x86_64-pc-linux-gnu strace -f $RUSTC example/mini_core.rs --crate-name mini_core --crate-type lib,dylib --target $TARGET_TRIPLE

echo "[BUILD] example"
$RUSTC example/example.rs --crate-type lib --target $TARGET_TRIPLE
Expand Down Expand Up @@ -337,6 +337,7 @@ function extended_sysroot_tests() {
}

function test_rustc() {
# FIXME: LTO UI tests probably fail because GCC_EXEC_PREFIX is not set.
echo
echo "[TEST] rust-lang/rust"

Expand Down

0 comments on commit 4dce16a

Please sign in to comment.