Sentry. New server sentry.musescore.com

.github/workflows/build_all.yml

@@ -21,7 +21,7 @@ on:
         default: 'off'
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         required: false
       use_qt69:
@@ -51,7 +51,7 @@ on:
         type: string
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         type: string
         required: false

.github/workflows/build_linux.yml

@@ -17,7 +17,7 @@ on:
         default: 'off'
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         required: false
       use_qt69:
@@ -42,7 +42,7 @@ on:
         type: string
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         type: string
         required: false
@@ -104,8 +104,8 @@ jobs:
     - name: Configure workflow
       env:
         pull_request_title: ${{ github.event.pull_request.title }}
-        SENTRY_SERVER_MU4_KEY: ${{ secrets.SENTRY_SERVER_MU4_KEY }}
-        SENTRY_SERVER_SANDBOX_KEY: ${{ secrets.SENTRY_SERVER_SANDBOX_KEY }}
+        SENTRY_MUSE_MU4_KEY: ${{ secrets.SENTRY_MUSE_MU4_KEY }}
+        SENTRY_MUSE_MU4_SANDBOX_KEY: ${{ secrets.SENTRY_MUSE_MU4_SANDBOX_KEY }}
         SENTRY_PROJECT: ${{ inputs.sentry_project }}
       run: |
         bash ./buildscripts/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ inputs.build_mode }}
@@ -131,24 +131,24 @@ jobs:
         DO_UPLOAD_SYMBOLS='false'
         SENTRY_URL=""
 
-        if [ "$SENTRY_SERVER_MU4_KEY" != "" ]; then
-          if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then
+        if [ "$SENTRY_MUSE_MU4_KEY" != "" ]; then
+          if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then 
             SENTRY_PROJECT="mu4"
           fi
 
           if [ "$SENTRY_PROJECT" == "mu4" ]; then
             DO_UPLOAD_SYMBOLS='true'
-            SENTRY_URL=https://sentry.musescore.org/api/4/minidump/?sentry_key=$SENTRY_SERVER_MU4_KEY
+            SENTRY_URL=https://sentry.musescore.com/api/4/minidump/?sentry_key=$SENTRY_MUSE_MU4_KEY
           fi
         fi
 
         if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "nightly" ]; then
-          SENTRY_PROJECT="sandbox"
+          SENTRY_PROJECT="mu4-sandbox"
         fi
 
-        if [ "$SENTRY_PROJECT" == "sandbox" ] && [ "$SENTRY_SERVER_SANDBOX_KEY" != "" ]; then
+        if [ "$SENTRY_PROJECT" == "mu4-sandbox" ] && [ "$SENTRY_MUSE_MU4_SANDBOX_KEY" != "" ]; then
           DO_UPLOAD_SYMBOLS='true'
-          SENTRY_URL=https://sentry.musescore.org/api/3/minidump/?sentry_key=$SENTRY_SERVER_SANDBOX_KEY
+          SENTRY_URL=https://sentry.musescore.com/api/3/minidump/?sentry_key=$SENTRY_MUSE_MU4_SANDBOX_KEY
         fi
 
         DO_PUBLISH='false'
@@ -239,13 +239,13 @@ jobs:
       run: |
         APP_BIN=$(find "$(pwd)/build.release/src/app/" -type f -name "mscore4portable*" -print -quit)
         ARCH=${{ matrix.dump-symbols-arch }}
-        cmake -DAPP_BIN=${APP_BIN} \
-              -DARCH=${ARCH} \
-              -DSENTRY_URL=https://sentry.musescore.org \
-              -DSENTRY_ORG=musescore \
-              -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
-              -DSENTRY_PROJECT=${SENTRY_PROJECT} \
-              -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake
+        sudo cmake -DAPP_BIN=${APP_BIN} \
+                   -DARCH=${ARCH} \
+                   -DSENTRY_URL=https://sentry.musescore.com \
+                   -DSENTRY_ORG=sentry \
+                   -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_MUSE_AUTH_TOKEN }} \
+                   -DSENTRY_PROJECT=${SENTRY_PROJECT} \
+                   -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake
     - name: Publish to OSUOSL
       if: env.DO_PUBLISH == 'true'
       run: |

.github/workflows/build_linux_arm32.yml

@@ -13,7 +13,7 @@ on:
         default: 'off'
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         required: false
       use_qt69:
@@ -33,7 +33,7 @@ on:
         type: string
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         type: string
         required: false
@@ -56,8 +56,8 @@ jobs:
     - name: Configure workflow
       env:
         pull_request_title: ${{ github.event.pull_request.title }}
-        SENTRY_SERVER_MU4_KEY: ${{ secrets.SENTRY_SERVER_MU4_KEY }}
-        SENTRY_SERVER_SANDBOX_KEY: ${{ secrets.SENTRY_SERVER_SANDBOX_KEY }}
+        SENTRY_MUSE_MU4_KEY: ${{ secrets.SENTRY_MUSE_MU4_KEY }}
+        SENTRY_MUSE_MU4_SANDBOX_KEY: ${{ secrets.SENTRY_MUSE_MU4_SANDBOX_KEY }}
         SENTRY_PROJECT: ${{ inputs.sentry_project }}
       run: |
         bash ./buildscripts/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ inputs.build_mode }}
@@ -83,24 +83,24 @@ jobs:
         DO_UPLOAD_SYMBOLS='false'
         SENTRY_URL=""
 
-        if [ "$SENTRY_SERVER_MU4_KEY" != "" ]; then
+        if [ "$SENTRY_MUSE_MU4_KEY" != "" ]; then
           if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then
             SENTRY_PROJECT="mu4"
           fi
 
           if [ "$SENTRY_PROJECT" == "mu4" ]; then
             DO_UPLOAD_SYMBOLS='true'
-            SENTRY_URL=https://sentry.musescore.org/api/4/minidump/?sentry_key=$SENTRY_SERVER_MU4_KEY
+            SENTRY_URL=https://sentry.musescore.com/api/4/minidump/?sentry_key=$SENTRY_MUSE_MU4_KEY
           fi
         fi
 
         if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "nightly" ]; then
-          SENTRY_PROJECT="sandbox"
+          SENTRY_PROJECT="mu4-sandbox"
         fi
 
-        if [ "$SENTRY_PROJECT" == "sandbox" ] && [ "$SENTRY_SERVER_SANDBOX_KEY" != "" ]; then
+        if [ "$SENTRY_PROJECT" == "mu4-sandbox" ] && [ "$SENTRY_MUSE_MU4_SANDBOX_KEY" != "" ]; then
           DO_UPLOAD_SYMBOLS='true'
-          SENTRY_URL=https://sentry.musescore.org/api/3/minidump/?sentry_key=$SENTRY_SERVER_SANDBOX_KEY
+          SENTRY_URL=https://sentry.musescore.com/api/3/minidump/?sentry_key=$SENTRY_MUSE_MU4_SANDBOX_KEY
         fi
 
         DO_PUBLISH='false'
@@ -160,13 +160,13 @@ jobs:
       run: |
         APP_BIN=$(find "$(pwd)/build.release/src/app/" -type f -name "mscore4portable*" -print -quit)
         ARCH=armv7l
-        cmake -DAPP_BIN=${APP_BIN} \
-              -DARCH=${ARCH} \
-              -DSENTRY_URL=https://sentry.musescore.org \
-              -DSENTRY_ORG=musescore \
-              -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
-              -DSENTRY_PROJECT=${SENTRY_PROJECT} \
-              -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake
+        sudo cmake -DAPP_BIN=${APP_BIN} \
+                   -DARCH=${ARCH} \
+                   -DSENTRY_URL=https://sentry.musescore.com \
+                   -DSENTRY_ORG=sentry \
+                   -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_MUSE_AUTH_TOKEN }} \
+                   -DSENTRY_PROJECT=${SENTRY_PROJECT} \
+                   -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake
     - name: Publish to OSUOSL
       if: env.DO_PUBLISH == 'true'
       run: |

.github/workflows/build_macos.yml

@@ -13,7 +13,7 @@ on:
         default: 'off'
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         required: false
       use_qt69:
@@ -33,7 +33,7 @@ on:
         type: string
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         type: string
         required: false
@@ -61,8 +61,8 @@ jobs:
     - name: Configure workflow
       env:
         pull_request_title: ${{ github.event.pull_request.title }}
-        SENTRY_SERVER_MU4_KEY: ${{ secrets.SENTRY_SERVER_MU4_KEY }}
-        SENTRY_SERVER_SANDBOX_KEY: ${{ secrets.SENTRY_SERVER_SANDBOX_KEY }}
+        SENTRY_MUSE_MU4_KEY: ${{ secrets.SENTRY_MUSE_MU4_KEY }}
+        SENTRY_MUSE_MU4_SANDBOX_KEY: ${{ secrets.SENTRY_MUSE_MU4_SANDBOX_KEY }}
         SENTRY_PROJECT: ${{ inputs.sentry_project }}
       run: |
         bash ./buildscripts/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ inputs.build_mode }}
@@ -100,24 +100,24 @@ jobs:
         DO_UPLOAD_SYMBOLS='false'
         SENTRY_URL=""
 
-        if [ "$SENTRY_SERVER_MU4_KEY" != "" ]; then
-          if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then
+        if [ "$SENTRY_MUSE_MU4_KEY" != "" ]; then
+          if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then 
             SENTRY_PROJECT="mu4"
           fi
 
           if [ "$SENTRY_PROJECT" == "mu4" ]; then
             DO_UPLOAD_SYMBOLS='true'
-            SENTRY_URL=https://sentry.musescore.org/api/4/minidump/?sentry_key=$SENTRY_SERVER_MU4_KEY
+            SENTRY_URL=https://sentry.musescore.com/api/4/minidump/?sentry_key=$SENTRY_MUSE_MU4_KEY
           fi
         fi
 
         if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "nightly" ]; then
-          SENTRY_PROJECT="sandbox"
+          SENTRY_PROJECT="mu4-sandbox"
         fi
 
-        if [ "$SENTRY_PROJECT" == "sandbox" ] && [ "$SENTRY_SERVER_SANDBOX_KEY" != "" ]; then
+        if [ "$SENTRY_PROJECT" == "mu4-sandbox" ] && [ "$SENTRY_MUSE_MU4_SANDBOX_KEY" != "" ]; then
           DO_UPLOAD_SYMBOLS='true'
-          SENTRY_URL=https://sentry.musescore.org/api/3/minidump/?sentry_key=$SENTRY_SERVER_SANDBOX_KEY
+          SENTRY_URL=https://sentry.musescore.com/api/3/minidump/?sentry_key=$SENTRY_MUSE_MU4_SANDBOX_KEY
         fi
 
         DO_PUBLISH='false'
@@ -214,9 +214,9 @@ jobs:
         cmake -DAPP_BIN=${APP_BIN} \
               -DGENERATE_ARCHS="${GENERATE_ARCHS}" \
               -DBUILD_DIR=${BUILD_DIR} \
-              -DSENTRY_URL=https://sentry.musescore.org \
-              -DSENTRY_ORG=musescore \
-              -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
+              -DSENTRY_URL=https://sentry.musescore.com \
+              -DSENTRY_ORG=sentry \
+              -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_MUSE_AUTH_TOKEN }} \
               -DSENTRY_PROJECT=${SENTRY_PROJECT} \
               -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake
     - name: Publish to OSUOSL

.github/workflows/build_windows.yml

@@ -17,7 +17,7 @@ on:
         default: 'off'
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         required: false
       use_qt69:
@@ -42,7 +42,7 @@ on:
         type: string
         required: false
       sentry_project:
-        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), sandbox'
+        description: 'Upload symbols and dumps to Sentry (choose a project): mu4(default for stable build), mu4-sandbox'
         default: ''
         type: string
         required: false
@@ -70,8 +70,8 @@ jobs:
       shell: bash
       env:
         pull_request_title: ${{ github.event.pull_request.title }}
-        SENTRY_SERVER_MU4_KEY: ${{ secrets.SENTRY_SERVER_MU4_KEY }}
-        SENTRY_SERVER_SANDBOX_KEY: ${{ secrets.SENTRY_SERVER_SANDBOX_KEY }}
+        SENTRY_MUSE_MU4_KEY: ${{ secrets.SENTRY_MUSE_MU4_KEY }}
+        SENTRY_MUSE_MU4_SANDBOX_KEY: ${{ secrets.SENTRY_MUSE_MU4_SANDBOX_KEY }}
         SENTRY_PROJECT: ${{ inputs.sentry_project }}
       run: |
         bash ./buildscripts/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ inputs.build_mode }}
@@ -97,24 +97,24 @@ jobs:
         DO_UPLOAD_SYMBOLS='false'
         SENTRY_URL=""
 
-        if [ "$SENTRY_SERVER_MU4_KEY" != "" ]; then
-          if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then
+        if [ "$SENTRY_MUSE_MU4_KEY" != "" ]; then
+          if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "stable" ]; then 
             SENTRY_PROJECT="mu4"
           fi
 
           if [ "$SENTRY_PROJECT" == "mu4" ]; then
             DO_UPLOAD_SYMBOLS='true'
-            SENTRY_URL=https://sentry.musescore.org/api/4/minidump/?sentry_key=$SENTRY_SERVER_MU4_KEY
+            SENTRY_URL=https://sentry.musescore.com/api/4/minidump/?sentry_key=$SENTRY_MUSE_MU4_KEY
           fi
         fi
 
         if [ -z "$SENTRY_PROJECT" ] && [ "$BUILD_MODE" == "nightly" ]; then
-          SENTRY_PROJECT="sandbox"
+          SENTRY_PROJECT="mu4-sandbox"
         fi
 
-        if [ "$SENTRY_PROJECT" == "sandbox" ] && [ "$SENTRY_SERVER_SANDBOX_KEY" != "" ]; then
+        if [ "$SENTRY_PROJECT" == "mu4-sandbox" ] && [ "$SENTRY_MUSE_MU4_SANDBOX_KEY" != "" ]; then
           DO_UPLOAD_SYMBOLS='true'
-          SENTRY_URL=https://sentry.musescore.org/api/3/minidump/?sentry_key=$SENTRY_SERVER_SANDBOX_KEY
+          SENTRY_URL=https://sentry.musescore.com/api/3/minidump/?sentry_key=$SENTRY_MUSE_MU4_SANDBOX_KEY
         fi
 
         DO_PUBLISH='false'
@@ -211,11 +211,11 @@ jobs:
       if: env.DO_UPLOAD_SYMBOLS == 'true'
       shell: bash
       run: |
-        APP_BIN=$(pwd)/build.release/src/app/MuseScore4.pdb
+        APP_BIN=$(pwd)/build.release/MuseScore4.pdb
         cmake -DAPP_BIN=${APP_BIN} \
-              -DSENTRY_URL=https://sentry.musescore.org \
-              -DSENTRY_ORG=musescore \
-              -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
+              -DSENTRY_URL=https://sentry.musescore.com \
+              -DSENTRY_ORG=sentry \
+              -DSENTRY_AUTH_TOKEN=${{ secrets.SENTRY_MUSE_AUTH_TOKEN }} \
               -DSENTRY_PROJECT=${SENTRY_PROJECT} \
               -P buildscripts/ci/crashdumps/ci_generate_and_upload.cmake
     - name: Publish to OSUOSL

buildscripts/ci/crashdumps/ci_generate_dumpsyms.cmake

@@ -18,6 +18,7 @@ if(WIN32)
 elseif(LINUX)
     file(ARCHIVE_EXTRACT INPUT "${HERE}/linux/${ARCH}/dump_syms.7z" DESTINATION "${HERE}/linux/")
     set(DUMPSYMS_BIN "${HERE}/linux/dump_syms")
+    execute_process(COMMAND chmod +x ${DUMPSYMS_BIN})
 elseif(APPLE)
     file(ARCHIVE_EXTRACT INPUT "${HERE}/macos/dump_syms.7z" DESTINATION "${HERE}/macos/")
     set(DUMPSYMS_BIN "${HERE}/macos/dump_syms")

buildscripts/cmake/GetPaths.cmake

@@ -1,7 +1,7 @@
 include(GetPlatformInfo)
 
 if (OS_IS_MAC)
-    set(INSTALL_SUBDIR ${CMAKE_PROJECT_NAME}.app/Contents/MacOS/)
+    set(INSTALL_SUBDIR mscore.app/Contents/MacOS/)
     set(INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR})
 else()
     set(INSTALL_SUBDIR bin)

src/framework/diagnostics/CMakeLists.txt

@@ -77,6 +77,7 @@ set(MODULE_SRC
 # --- Crashpad ---
 # Not building with MinGW, so turned off for MinGW
 include(GetCompilerInfo)
+include(GetPaths)
 if (CC_IS_MINGW)
     set(BUILD_CRASHPAD_CLIENT OFF)
 endif(CC_IS_MINGW)
@@ -130,7 +131,7 @@ if (MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT)
             set(MUSE_MODULE_DIAGNOSTICS_CRASHPAD_HANDLER_PATH ${CPAD_ROOT_PATH}/macos/crashpad_handler)
         endif()
 
-        install(PROGRAMS ${MUSE_MODULE_DIAGNOSTICS_CRASHPAD_HANDLER_PATH} DESTINATION ${INSTALL_SUBDIR})
+        install(PROGRAMS ${MUSE_MODULE_DIAGNOSTICS_CRASHPAD_HANDLER_PATH} DESTINATION ${INSTALL_BIN_DIR})
     endif()
 endif() # MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT
 # ----------------