From 7dd8e4195c46da918afaa258178de8d0582b2778 Mon Sep 17 00:00:00 2001 From: Kei Kamikawa Date: Tue, 5 Nov 2024 10:02:00 +0900 Subject: [PATCH 1/3] added macOS 11 and 12 build check in CI --- .github/workflows/compile.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 6e097a3..e0e2455 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -28,6 +28,8 @@ jobs: fail-fast: false matrix: os: + - macos-11 # Intel + - macos-12 # Intel - macos-13 # Intel - macos-14 - macos-15 From 0965e8e34b05f4d1e38339cb1d28ab29904fceb0 Mon Sep 17 00:00:00 2001 From: Kei Kamikawa Date: Tue, 5 Nov 2024 11:13:24 +0900 Subject: [PATCH 2/3] added #ifdef INCLUDE_TARGET_OSX_14 for VZNetworkBlockDeviceStorageDeviceAttachment --- virtualization_14.h | 2 ++ virtualization_14.m | 2 ++ 2 files changed, 4 insertions(+) diff --git a/virtualization_14.h b/virtualization_14.h index c962269..97d06c1 100644 --- a/virtualization_14.h +++ b/virtualization_14.h @@ -22,8 +22,10 @@ void *newVZNVMExpressControllerDeviceConfiguration(void *attachment); void *newVZDiskBlockDeviceStorageDeviceAttachment(int fileDescriptor, bool readOnly, int syncMode, void **error); void *newVZNetworkBlockDeviceStorageDeviceAttachment(const char *url, double timeout, bool forcedReadOnly, int syncMode, void **error, uintptr_t cgoHandle); +#ifdef INCLUDE_TARGET_OSX_14 @interface VZNetworkBlockDeviceStorageDeviceAttachmentDelegateImpl : NSObject - (instancetype)initWithHandle:(uintptr_t)cgoHandle; - (void)attachment:(VZNetworkBlockDeviceStorageDeviceAttachment *)attachment didEncounterError:(NSError *)error API_AVAILABLE(macos(14.0)); - (void)attachmentWasConnected:(VZNetworkBlockDeviceStorageDeviceAttachment *)attachment API_AVAILABLE(macos(14.0)); @end +#endif diff --git a/virtualization_14.m b/virtualization_14.m index 9fbe6e4..b6970f0 100644 --- a/virtualization_14.m +++ b/virtualization_14.m @@ -91,6 +91,7 @@ RAISE_UNSUPPORTED_MACOS_EXCEPTION(); } +#ifdef INCLUDE_TARGET_OSX_14 @implementation VZNetworkBlockDeviceStorageDeviceAttachmentDelegateImpl { uintptr_t _cgoHandle; } @@ -112,3 +113,4 @@ - (void)attachmentWasConnected:(VZNetworkBlockDeviceStorageDeviceAttachment *)at attachmentWasConnectedHandler(_cgoHandle); } @end +#endif From 1f1e9a722f49b8e3c7a453d981bebc1f03b8c1fc Mon Sep 17 00:00:00 2001 From: Kei Kamikawa Date: Tue, 5 Nov 2024 11:20:36 +0900 Subject: [PATCH 3/3] Revert "added macOS 11 and 12 build check in CI" This reverts commit 7dd8e4195c46da918afaa258178de8d0582b2778. --- .github/workflows/compile.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index e0e2455..6e097a3 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -28,8 +28,6 @@ jobs: fail-fast: false matrix: os: - - macos-11 # Intel - - macos-12 # Intel - macos-13 # Intel - macos-14 - macos-15