Merge pull request #220 from madsmtm/github-macos-transition

No longer test on macOS 10.15

Author: madsmtm

.github/workflows/ci.yml

@@ -39,18 +39,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Test macOS 10.15
-            os: macos-10.15
-            target: x86_64-apple-darwin
           - name: Test macOS 11
             os: macos-11
             target: x86_64-apple-darwin
+          - name: Test macOS 12
+            os: macos-12
+            target: x86_64-apple-darwin
           - name: Build macOS AArch64
-            os: macos-11
+            os: macos-latest
             target: aarch64-apple-darwin
             test-args: --no-run
           - name: Test macOS old SDK
-            os: macos-11
+            os: macos-latest
             target: x86_64-apple-darwin
             # Oldest macOS version we support
             sdk: "10.7"
@@ -62,7 +62,7 @@ jobs:
             # Run UI tests on nightly to help find regressions
             ui: true
           - name: Build macOS 32bit
-            os: macos-10.15
+            os: macos-latest
             target: i686-apple-darwin
             rust:
               toolchain: nightly
@@ -97,7 +97,7 @@ jobs:
             runtime: gnustep-1-9
             libobjc2: "1.9"
           - name: Test iOS simulator x86 64bit
-            os: macos-11
+            os: macos-latest
             target: x86_64-apple-ios
             dinghy: true
           - name: Build iOS simulator ARM64

objc2-foundation/src/thread.rs

@@ -202,8 +202,18 @@ mod tests {
     )]
     fn test_debug() {
         let thread = NSThread::main();
-        let expected = format!("<NSThread: {:p}>{{number = 1, name = (null)}}", thread);
-        assert_eq!(format!("{:?}", thread), expected);
+
+        let actual = format!("{:?}", thread);
+        let expected_macos_11 = format!("<NSThread: {:p}>{{number = 1, name = (null)}}", thread);
+        let expected_macos_12 =
+            format!("<_NSMainThread: {:p}>{{number = 1, name = (null)}}", thread);
+        assert!(
+            actual == expected_macos_11 || actual == expected_macos_12,
+            "Expected one of {:?} or {:?}, got {:?}",
+            expected_macos_11,
+            expected_macos_12,
+            actual,
+        );
 
         // SAFETY: We don't use the marker for anything other than its Debug
         // impl, so this test doesn't actually need to run on the main thread!

tests/extern/encode_utils.m

@@ -81,7 +81,8 @@
     id b;
     void (*c)(void);
 };
-ENCODING(STRUCT_WITH_BLOCK, struct with_block);
+ENCODING_INNER(STRUCT_WITH_BLOCK, struct with_block); \
+ENCODING_INNER(STRUCT_WITH_BLOCK_POINTER, struct with_block*); \
 
 struct with_atomic_inner {
     _Atomic int a;

tests/src/test_encode_utils.rs

@@ -239,7 +239,6 @@ const WITH_BLOCK: Encoding<'static> = Encoding::Struct(
 );
 assert_inner!(str ENCODING_STRUCT_WITH_BLOCK => WITH_BLOCK);
 assert_inner!(str ENCODING_STRUCT_WITH_BLOCK_POINTER => Encoding::Pointer(&WITH_BLOCK));
-assert_inner!(str ENCODING_STRUCT_WITH_BLOCK_ATOMIC => "A{with_block}");
 
 assert_inner!(str ENCODING_STRUCT_WITH_ATOMIC => "{with_atomic=Ai^Ai{with_atomic_inner=Ai^Ai}^{with_atomic_inner}^A{with_atomic_inner}}");
 assert_inner!(str ENCODING_STRUCT_WITH_ATOMIC_POINTER => "^{with_atomic=Ai^Ai{with_atomic_inner=Ai^Ai}^{with_atomic_inner}^A{with_atomic_inner}}");