Skip to content

Commit f5c4427

Browse files
authored
Merge pull request #3587 from JohnTitor/fix-macos
Fix CI
2 parents 7d19eed + ba128d7 commit f5c4427

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/full_ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ jobs:
6262
ARCH_BITS: 64
6363
ARCH: x86_64
6464
- target: x86_64-pc-windows-msvc
65-
- target: i686-pc-windows-gnu
66-
env:
67-
ARCH_BITS: 32
68-
ARCH: i686
65+
# FIXME: It currently causes segfaults.
66+
#- target: i686-pc-windows-gnu
67+
# env:
68+
# ARCH_BITS: 32
69+
# ARCH: i686
6970
- target: i686-pc-windows-msvc
7071
steps:
7172
- uses: actions/checkout@v4

libc-test/build.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ fn test_apple(target: &str) {
296296
// it is a moving target, changing through versions
297297
// also contains bitfields members
298298
"tcp_connection_info" => true,
299+
// FIXME: The size is changed in recent macOSes.
300+
"malloc_introspection_t" => true,
299301

300302
_ => false,
301303
}
@@ -2427,6 +2429,9 @@ fn test_freebsd(target: &str) {
24272429
true
24282430
}
24292431

2432+
// FIXME: Removed in FreeBSD 15:
2433+
"LOCAL_CONNWAIT" => true,
2434+
24302435
_ => false,
24312436
}
24322437
});

0 commit comments

Comments
 (0)