From 2e6d63bd460bbc4f56f95d9127a4340f994d11df Mon Sep 17 00:00:00 2001 From: yucelalbar Date: Fri, 26 Nov 2021 15:35:12 +0300 Subject: [PATCH 1/4] fix(STAFF-122416): Unsent sentry events for M1 --- CMakeLists.txt | 4 ++-- external/breakpad | 2 +- external/crashpad | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7311160..027b73d8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ endif() if(APPLE) if(DEFINED ENV{GITHUB_ACTIONS}) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE) - message(STATUS "Setting OSX target to 10.13") + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.6" CACHE STRING "Minimum OS X deployment version" FORCE) + message(STATUS "Setting OSX target to 11.6") else() message(STATUS "Assuming local OSX build - not setting sdk target...") endif() diff --git a/external/breakpad b/external/breakpad index 6690e19d9..63c90f00b 160000 --- a/external/breakpad +++ b/external/breakpad @@ -1 +1 @@ -Subproject commit 6690e19d9d42874a782e154f2fc7fd55c7a9dc91 +Subproject commit 63c90f00bf64a1b4a8883e50bbe8217048ed2a85 diff --git a/external/crashpad b/external/crashpad index 54710627f..6ef50f63c 160000 --- a/external/crashpad +++ b/external/crashpad @@ -1 +1 @@ -Subproject commit 54710627f24c79e689b8233e655c612b2427bc44 +Subproject commit 6ef50f63c189caeb941ef21a22fc2a7c753573ba From 4a970cbaeb2ea7844a158a457284695390963b65 Mon Sep 17 00:00:00 2001 From: yucelalbar Date: Fri, 26 Nov 2021 15:49:28 +0300 Subject: [PATCH 2/4] Change SDK version to 11.3 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 027b73d8b..bdb96adda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ endif() if(APPLE) if(DEFINED ENV{GITHUB_ACTIONS}) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.6" CACHE STRING "Minimum OS X deployment version" FORCE) - message(STATUS "Setting OSX target to 11.6") + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) + message(STATUS "Setting OSX target to 11.3") else() message(STATUS "Assuming local OSX build - not setting sdk target...") endif() From 37e5f054e04fb2688c3f5e7d1c3d09f4c1f273ea Mon Sep 17 00:00:00 2001 From: yucelalbar Date: Mon, 29 Nov 2021 09:23:05 +0300 Subject: [PATCH 3/4] Change SDK version to 10.13 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdb96adda..ac7311160 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ endif() if(APPLE) if(DEFINED ENV{GITHUB_ACTIONS}) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) - message(STATUS "Setting OSX target to 11.3") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE) + message(STATUS "Setting OSX target to 10.13") else() message(STATUS "Assuming local OSX build - not setting sdk target...") endif() From 998d080c74d123f5805d681dfc86e7daddd989bb Mon Sep 17 00:00:00 2001 From: yucelalbar Date: Mon, 29 Nov 2021 10:58:56 +0300 Subject: [PATCH 4/4] Change SENTRY_BACKEND option as crashpad for Windows and CMAKE_OSX_ARCHITECTURES option as arm64;x86_64 for MacOs --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8de88c126..269bd82d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,10 +100,10 @@ jobs: if [[ -v MOS ]] && [[ $MOS == "vs2017-win2016" ]]; then ARCH=Win32; else ARCH=x64; fi echo ARCH=$ARCH >> $GITHUB_ENV cmake --version - cmake -B build-release -DSENTRY_BUILD_SHARED_LIBS=OFF -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -DSENTRY_BACKEND=breakpad -A $ARCH + cmake -B build-release -DSENTRY_BUILD_SHARED_LIBS=OFF -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -DSENTRY_BACKEND=crashpad -A $ARCH cmake --build build-release --config Release cmake --install build-release --prefix release --config Release - cmake -B build-debug -DSENTRY_BUILD_SHARED_LIBS=OFF -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -DSENTRY_BACKEND=breakpad -A $ARCH + cmake -B build-debug -DSENTRY_BUILD_SHARED_LIBS=OFF -DCMAKE_SYSTEM_VERSION="10.0.18362.0" -DSENTRY_BACKEND=crashpad -A $ARCH cmake --build build-debug --parallel --config Debug cmake --install build-debug --prefix debug --config Debug @@ -127,7 +127,7 @@ jobs: shell: bash run: | cmake --version - cmake -B build -DSENTRY_BUILD_SHARED_LIBS=OFF -DSENTRY_BACKEND=crashpad + cmake -B build -DSENTRY_BUILD_SHARED_LIBS=OFF -DSENTRY_BACKEND=crashpad -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 cmake --build build --parallel --config Release cmake --install build --prefix install --config Release