Skip to content

Commit a3b6444

Browse files
committed
Fix CI
1 parent 4d8b25c commit a3b6444

File tree

6 files changed

+19
-10
lines changed

6 files changed

+19
-10
lines changed

.github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ jobs:
101101
./y.sh prepare --only-libcore
102102
# TODO: remove --features master when it is back to the default.
103103
./y.sh build --features master
104-
cargo test
104+
# TODO: remove --features master when it is back to the default.
105+
cargo test --features master
105106
./clean_all.sh
106107
107108
- name: Prepare dependencies

.github/workflows/failures.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ jobs:
2121
libgccjit_version:
2222
- gcc: "libgccjit.so"
2323
artifacts_branch: "master"
24+
# TODO: switch back to --no-default-features in the case of libgccjit 12 when the default is to enable
25+
# master again.
26+
extra: "--features master"
2427
- gcc: "libgccjit_without_int128.so"
2528
artifacts_branch: "master-without-128bit-integers"
29+
extra: "--features master"
2630
- gcc: "libgccjit12.so"
2731
artifacts_branch: "gcc12"
28-
extra: "--no-default-features"
2932
# FIXME(antoyo): we need to set GCC_EXEC_PREFIX so that the linker can find the linker plugin.
3033
# Not sure why it's not found otherwise.
3134
env_extra: "TEST_FLAGS='-Cpanic=abort -Zpanic-abort-tests' GCC_EXEC_PREFIX=/usr/lib/gcc/"
@@ -125,6 +128,5 @@ jobs:
125128
- name: Run tests
126129
id: tests
127130
run: |
128-
# TODO: remove --features master when it is back to the default.
129-
${{ matrix.libgccjit_version.env_extra }} ./test.sh --release --features master --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log
131+
${{ matrix.libgccjit_version.env_extra }} ./test.sh --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log
130132
rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY

.github/workflows/m68k.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ jobs:
116116
./y.sh prepare --only-libcore --cross
117117
# TODO: remove --features master when it is back to the default.
118118
./y.sh build --target-triple m68k-unknown-linux-gnu --features master
119-
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test
119+
# TODO: remove --features master when it is back to the default.
120+
CG_GCC_TEST_TARGET=m68k-unknown-linux-gnu cargo test --features master
120121
./clean_all.sh
121122
122123
- name: Prepare dependencies

.github/workflows/release.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ jobs:
8080
./y.sh prepare --only-libcore
8181
# TODO: remove --features master when it is back to the default.
8282
EMBED_LTO_BITCODE=1 ./y.sh build --release --release-sysroot --features master
83-
cargo test
83+
# TODO: remove --features master when it is back to the default.
84+
cargo test --features master
8485
./clean_all.sh
8586
8687
- name: Prepare dependencies

.github/workflows/stdarch.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ jobs:
9292
- name: Build
9393
run: |
9494
./y.sh prepare --only-libcore
95-
# TODO: remove --features master when it is back to the default.
95+
# TODO: remove `--features master` when it is back to the default.
9696
./y.sh build --release --release-sysroot --features master
97-
cargo test
97+
# TODO: remove --features master when it is back to the default.
98+
cargo test --features master
9899
99100
- name: Clean
100101
if: ${{ !matrix.cargo_runner }}
@@ -112,12 +113,14 @@ jobs:
112113
uses: actions-rs/[email protected]
113114
with:
114115
command: build
115-
args: --release
116+
# TODO: remove `--features master` when it is back to the default.
117+
args: --release --features master
116118

117119
- name: Run tests
118120
if: ${{ !matrix.cargo_runner }}
119121
run: |
120-
./test.sh --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore
122+
# TODO: remove `--features master` when it is back to the default.
123+
./test.sh --release --clean --release-sysroot --build-sysroot --mini-tests --std-tests --test-libcore --features master
121124
122125
- name: Run stdarch tests
123126
if: ${{ !matrix.cargo_runner }}

failing-ui-tests12.txt

+1
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ tests/ui/sse2.rs
3939
tests/ui/codegen/issue-79865-llvm-miscompile.rs
4040
tests/ui/intrinsics/intrinsics-integer.rs
4141
tests/ui/std-backtrace.rs
42+
tests/ui/mir/alignment/packed.rs

0 commit comments

Comments
 (0)