Merge pull request #1175 from AkihiroSuda/fix-macos-10-15

Fix compilation on macOS 10.15

Author: AkihiroSuda

.github/workflows/test.yml

@@ -145,6 +145,23 @@ jobs:
     # GHA macOS is slow and flaky, so we only test a few YAMLS here.
     # Other yamls are tested on Linux instances of Cirrus.
 
+  catalina:
+    name: "macOS 10.15 (deprecated)"
+    # Will be fully unsupported by 12/1/22 https://github.com/actions/runner-images/issues/5583
+    runs-on: macos-10.15
+    timeout-minutes: 20
+    steps:
+    - uses: actions/setup-go@v3
+      with:
+        go-version: 1.19.x
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 1
+    - name: Make
+      run: make
+    - name: Install
+      run: make install
+
   vmnet:
     name: "VMNet test"
     runs-on: macos-11

Makefile

@@ -13,12 +13,21 @@ bat = .bat
 exe = .exe
 endif
 
+GO_BUILDTAGS ?=
+ifeq ($(GOOS),darwin)
+MACOS_VERSION=$(shell sw_vers -productVersion | cut -d . -f 1)
+ifeq ($(shell test $(MACOS_VERSION) -lt 13; echo $$?),0)
+# The "vz" mode needs macOS 13 or later
+GO_BUILDTAGS += no_vz
+endif
+endif
+
 PACKAGE := github.com/lima-vm/lima
 
 VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)
 VERSION_TRIMMED := $(VERSION:v%=%)
 
-GO_BUILD := $(GO) build -ldflags="-s -w -X $(PACKAGE)/pkg/version.Version=$(VERSION)"
+GO_BUILD := $(GO) build -ldflags="-s -w -X $(PACKAGE)/pkg/version.Version=$(VERSION)" -tags "$(GO_BUILDTAGS)"
 
 .NOTPARALLEL:
 

pkg/vz/vm_darwin.go

@@ -1,3 +1,6 @@
+//go:build darwin && !no_vz
+// +build darwin,!no_vz
+
 package vz
 
 import (

pkg/vz/vz_driver_darwin.go

@@ -1,3 +1,6 @@
+//go:build darwin && !no_vz
+// +build darwin,!no_vz
+
 package vz
 
 import (

pkg/vz/vz_driver_others.go

@@ -1,15 +1,17 @@
-//go:build !darwin
-// +build !darwin
+//go:build !darwin || no_vz
+// +build !darwin no_vz
 
 package vz
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"github.com/lima-vm/lima/pkg/driver"
 )
 
+var ErrUnsupported = errors.New("vm driver 'vz' needs macOS 13 or later (Hint: try recompiling Lima if you are seeing this error on macOS 13)")
+
 type LimaVzDriver struct {
 	*driver.BaseDriver
 }
@@ -21,17 +23,17 @@ func New(driver *driver.BaseDriver) *LimaVzDriver {
 }
 
 func (l *LimaVzDriver) Validate() error {
-	return fmt.Errorf("driver 'vz' is only supported on darwin")
+	return ErrUnsupported
 }
 
 func (l *LimaVzDriver) CreateDisk() error {
-	return fmt.Errorf("driver 'vz' is only supported on darwin")
+	return ErrUnsupported
 }
 
 func (l *LimaVzDriver) Start(ctx context.Context) (chan error, error) {
-	return nil, fmt.Errorf("driver 'vz' is only supported on darwin")
+	return nil, ErrUnsupported
 }
 
 func (l *LimaVzDriver) Stop(_ context.Context) error {
-	return fmt.Errorf("driver 'vz' is only supported on darwin")
+	return ErrUnsupported
 }