Merge branch 'master' into gavinfrazar/display-id-based-security-grou…

…p-rules
gravitational · Oct 5, 2024 · aa866d2 · aa866d2
2 parents 54d3e4a + c8b364e
commit aa866d2
Show file tree

Hide file tree

Showing 45 changed files with 5,429 additions and 2,250 deletions.
diff --git a/Makefile b/Makefile
@@ -316,9 +316,8 @@ endif
 
 ifeq ("$(OS)","darwin")
 # Set the minimum version for macOS builds for Go, Rust and Xcode builds.
-# Note the minimum version for Apple silicon (ARM64) is 11.0 and will be automatically
-# clamped to the value for builds of that architecture
-MINIMUM_SUPPORTED_MACOS_VERSION = 10.15
+# (as of Go 1.23 we require macOS 11)
+MINIMUM_SUPPORTED_MACOS_VERSION = 11.0
 MACOSX_VERSION_MIN_FLAG = -mmacosx-version-min=$(MINIMUM_SUPPORTED_MACOS_VERSION)
 
 # Go

diff --git a/api/client/proto/event.pb.go b/api/client/proto/event.pb.go